Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/BackedUpFileWriter.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/BackedUpFileWriter.cs (.../BackedUpFileWriter.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/BackedUpFileWriter.cs (.../BackedUpFileWriter.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -79,6 +79,7 @@ Revert(); throw; } + Finish(); } @@ -150,6 +151,7 @@ temporaryFilePath); throw new IOException(message, e); } + throw; } } @@ -174,6 +176,7 @@ targetFilePath); throw new IOException(message, e); } + throw; } } @@ -203,6 +206,7 @@ targetFilePath); throw new IOException(message, e); } + throw; } } @@ -226,6 +230,7 @@ temporaryFilePath); throw new CannotDeleteBackupFileException(message, e); } + throw; } } Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/AssessmentSectionCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -83,7 +83,7 @@ AddEntityForHydraulicDatabase(section.HydraulicBoundaryDatabase, entity, registry); AddHydraulicLocationCalculationEntities(section, entity, registry); AddEntityForReferenceLine(section, entity); - + entity.BackgroundDataEntities.Add(section.BackgroundData.Create()); entity.FailureMechanismEntities.Add(section.Piping.Create(registry)); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/CalculationGroupCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/CalculationGroupCreateExtensions.cs (.../CalculationGroupCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/CalculationGroupCreateExtensions.cs (.../CalculationGroupCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -83,46 +83,55 @@ { entity.CalculationGroupEntity1.Add(childGroup.Create(registry, i)); } + var childPipingCalculation = calculationBase as PipingCalculationScenario; if (childPipingCalculation != null) { entity.PipingCalculationEntities.Add(childPipingCalculation.Create(registry, i)); } + var childMacroStabilityInwardsCalculation = calculationBase as MacroStabilityInwardsCalculationScenario; if (childMacroStabilityInwardsCalculation != null) { entity.MacroStabilityInwardsCalculationEntities.Add(childMacroStabilityInwardsCalculation.Create(registry, i)); } + var childGrassCoverErosionInwardsCalculation = calculationBase as GrassCoverErosionInwardsCalculation; if (childGrassCoverErosionInwardsCalculation != null) { entity.GrassCoverErosionInwardsCalculationEntities.Add(childGrassCoverErosionInwardsCalculation.Create(registry, i)); } + var childGrassCoverErosionOutwardsCalculation = calculationBase as GrassCoverErosionOutwardsWaveConditionsCalculation; if (childGrassCoverErosionOutwardsCalculation != null) { entity.GrassCoverErosionOutwardsWaveConditionsCalculationEntities.Add(childGrassCoverErosionOutwardsCalculation.Create(registry, i)); } + var childHeightStructuresCalculation = calculationBase as StructuresCalculation; if (childHeightStructuresCalculation != null) { entity.HeightStructuresCalculationEntities.Add(childHeightStructuresCalculation.CreateForHeightStructures(registry, i)); } + var childClosingStructuresCalculation = calculationBase as StructuresCalculation; if (childClosingStructuresCalculation != null) { entity.ClosingStructuresCalculationEntities.Add(childClosingStructuresCalculation.CreateForClosingStructures(registry, i)); } + var childStabilityPointStructuresCalculation = calculationBase as StructuresCalculation; if (childStabilityPointStructuresCalculation != null) { entity.StabilityPointStructuresCalculationEntities.Add(childStabilityPointStructuresCalculation.CreateForStabilityPointStructures(registry, i)); } + var stabilityStoneCoverWaveConditionsCalculation = calculationBase as StabilityStoneCoverWaveConditionsCalculation; if (stabilityStoneCoverWaveConditionsCalculation != null) { entity.StabilityStoneCoverWaveConditionsCalculationEntities.Add(stabilityStoneCoverWaveConditionsCalculation.Create(registry, i)); } + var waveImpactAsphaltCoverWaveConditionsCalculation = calculationBase as WaveImpactAsphaltCoverWaveConditionsCalculation; if (waveImpactAsphaltCoverWaveConditionsCalculation != null) { Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/ClosingStructures/ClosingStructureCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/ClosingStructures/ClosingStructureCreateExtensions.cs (.../ClosingStructureCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/ClosingStructures/ClosingStructureCreateExtensions.cs (.../ClosingStructureCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -46,6 +46,7 @@ { throw new ArgumentNullException(nameof(registry)); } + if (registry.Contains(structure)) { return registry.Get(structure); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensions.cs (.../DuneErosionFailureMechanismCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensions.cs (.../DuneErosionFailureMechanismCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -70,7 +70,7 @@ DuneLocationCalculationCollectionEntity3 = failureMechanism.CalculationsForMechanismSpecificSignalingNorm.Create(registry), DuneLocationCalculationCollectionEntity2 = failureMechanism.CalculationsForMechanismSpecificLowerLimitNorm.Create(registry), DuneLocationCalculationCollectionEntity1 = failureMechanism.CalculationsForLowerLimitNorm.Create(registry), - DuneLocationCalculationCollectionEntity = failureMechanism.CalculationsForFactorizedLowerLimitNorm.Create(registry), + DuneLocationCalculationCollectionEntity = failureMechanism.CalculationsForFactorizedLowerLimitNorm.Create(registry) }; entity.DuneErosionFailureMechanismMetaEntities.Add(metaEntity); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/DuneErosion/DuneLocationCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/DuneErosion/DuneLocationCreateExtensions.cs (.../DuneLocationCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/DuneErosion/DuneLocationCreateExtensions.cs (.../DuneLocationCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -50,6 +50,7 @@ { throw new ArgumentNullException(nameof(registry)); } + if (registry.Contains(location)) { return registry.Get(location); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/FailureMechanismCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/FailureMechanismCreateExtensions.cs (.../FailureMechanismCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/FailureMechanismCreateExtensions.cs (.../FailureMechanismCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -78,6 +78,7 @@ { throw new ArgumentNullException(nameof(registry)); } + if (entity == null) { throw new ArgumentNullException(nameof(entity)); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/FailureMechanismSectionCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/FailureMechanismSectionCreateExtensions.cs (.../FailureMechanismSectionCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/FailureMechanismSectionCreateExtensions.cs (.../FailureMechanismSectionCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -45,6 +45,7 @@ { throw new ArgumentNullException(nameof(registry)); } + var failureMechanismSectionEntity = new FailureMechanismSectionEntity { Name = section.Name.DeepClone(), Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/ForeshoreProfileCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/ForeshoreProfileCreateExtensions.cs (.../ForeshoreProfileCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/ForeshoreProfileCreateExtensions.cs (.../ForeshoreProfileCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -46,6 +46,7 @@ { throw new ArgumentNullException(nameof(registry)); } + if (registry.Contains(foreshoreProfile)) { return registry.Get(foreshoreProfile); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/GrassCoverErosionInwards/DikeProfileCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/GrassCoverErosionInwards/DikeProfileCreateExtensions.cs (.../DikeProfileCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/GrassCoverErosionInwards/DikeProfileCreateExtensions.cs (.../DikeProfileCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -46,6 +46,7 @@ { throw new ArgumentNullException(nameof(registry)); } + if (registry.Contains(dikeProfile)) { return registry.Get(dikeProfile); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs (.../GrassCoverErosionInwardsCalculationCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensions.cs (.../GrassCoverErosionInwardsCalculationCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -77,6 +77,7 @@ { entity.DikeProfileEntity = registry.Get(input.DikeProfile); } + if (input.HydraulicBoundaryLocation != null) { entity.HydraulicLocationEntity = registry.Get(input.HydraulicBoundaryLocation); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -39,7 +39,7 @@ /// The object keeping track of create operations. /// A new . /// Thrown when any parameter is null. - internal static GrassCoverErosionInwardsSectionResultEntity Create(this GrassCoverErosionInwardsFailureMechanismSectionResult result, + internal static GrassCoverErosionInwardsSectionResultEntity Create(this GrassCoverErosionInwardsFailureMechanismSectionResult result, PersistenceRegistry registry) { if (result == null) @@ -51,6 +51,7 @@ { throw new ArgumentNullException(nameof(registry)); } + var sectionResultEntity = new GrassCoverErosionInwardsSectionResultEntity { SimpleAssessmentResult = Convert.ToByte(result.SimpleAssessmentResult), Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -69,7 +69,7 @@ return entity; } - private static void SetInputParameters(GrassCoverErosionOutwardsWaveConditionsCalculationEntity entity, + private static void SetInputParameters(GrassCoverErosionOutwardsWaveConditionsCalculationEntity entity, FailureMechanismCategoryWaveConditionsInput calculationInput, PersistenceRegistry registry) { @@ -78,6 +78,7 @@ { entity.HydraulicLocationEntity = registry.Get(hydraulicBoundaryLocation); } + if (calculationInput.ForeshoreProfile != null) { entity.ForeshoreProfileEntity = calculationInput.ForeshoreProfile.Create(registry, 0); @@ -96,7 +97,7 @@ entity.CategoryType = Convert.ToByte(calculationInput.CategoryType); } - private static void SetOutputEntities(GrassCoverErosionOutwardsWaveConditionsCalculationEntity entity, + private static void SetOutputEntities(GrassCoverErosionOutwardsWaveConditionsCalculationEntity entity, GrassCoverErosionOutwardsWaveConditionsCalculation calculation) { if (calculation.HasOutput) Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/HeightStructures/HeightStructureCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/HeightStructures/HeightStructureCreateExtensions.cs (.../HeightStructureCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/HeightStructures/HeightStructureCreateExtensions.cs (.../HeightStructureCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -46,6 +46,7 @@ { throw new ArgumentNullException(nameof(registry)); } + if (registry.Contains(structure)) { return registry.Get(structure); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsSoilProfile1DCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsSoilProfile1DCreateExtensions.cs (.../MacroStabilityInwardsSoilProfile1DCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsSoilProfile1DCreateExtensions.cs (.../MacroStabilityInwardsSoilProfile1DCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -49,6 +49,7 @@ { throw new ArgumentNullException(nameof(soilProfile)); } + if (registry == null) { throw new ArgumentNullException(nameof(registry)); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsSoilProfile2DCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsSoilProfile2DCreateExtensions.cs (.../MacroStabilityInwardsSoilProfile2DCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsSoilProfile2DCreateExtensions.cs (.../MacroStabilityInwardsSoilProfile2DCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -50,6 +50,7 @@ { throw new ArgumentNullException(nameof(soilProfile)); } + if (registry == null) { throw new ArgumentNullException(nameof(registry)); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilModelCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilModelCreateExtensions.cs (.../MacroStabilityInwardsStochasticSoilModelCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilModelCreateExtensions.cs (.../MacroStabilityInwardsStochasticSoilModelCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -50,6 +50,7 @@ { throw new ArgumentNullException(nameof(registry)); } + if (registry.Contains(model)) { return registry.Get(model); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileCreateExtensions.cs (.../MacroStabilityInwardsStochasticSoilProfileCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileCreateExtensions.cs (.../MacroStabilityInwardsStochasticSoilProfileCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -51,6 +51,7 @@ { throw new ArgumentNullException(nameof(stochasticSoilProfile)); } + if (registry == null) { throw new ArgumentNullException(nameof(registry)); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsSurfaceLineCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsSurfaceLineCreateExtensions.cs (.../MacroStabilityInwardsSurfaceLineCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsSurfaceLineCreateExtensions.cs (.../MacroStabilityInwardsSurfaceLineCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -51,6 +51,7 @@ { throw new ArgumentNullException(nameof(surfaceLine)); } + if (registry == null) { throw new ArgumentNullException(nameof(registry)); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacrostabilityOutwards/MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -52,7 +52,7 @@ TailorMadeAssessmentResult = Convert.ToByte(result.TailorMadeAssessmentResult), TailorMadeAssessmentProbability = result.TailorMadeAssessmentProbability.ToNaNAsNull(), UseManualAssemblyCategoryGroup = Convert.ToByte(result.UseManualAssemblyCategoryGroup), - ManualAssemblyCategoryGroup = Convert.ToByte(result.ManualAssemblyCategoryGroup) + ManualAssemblyCategoryGroup = Convert.ToByte(result.ManualAssemblyCategoryGroup) }; return sectionResultEntity; Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/PersistenceRegistry.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/PersistenceRegistry.cs (.../PersistenceRegistry.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/PersistenceRegistry.cs (.../PersistenceRegistry.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -132,6 +132,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -833,7 +834,7 @@ /// has been registered for . /// Use to find out /// whether a create operation has been registered for . - internal HydraulicLocationEntity Get(HydraulicBoundaryLocation model) + internal HydraulicLocationEntity Get(HydraulicBoundaryLocation model) { return Get(hydraulicLocations, model); } Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/Piping/PipingSoilProfileCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/Piping/PipingSoilProfileCreateExtensions.cs (.../PipingSoilProfileCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/Piping/PipingSoilProfileCreateExtensions.cs (.../PipingSoilProfileCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -51,6 +51,7 @@ { return registry.Get(profile); } + var entity = new PipingSoilProfileEntity { Name = profile.Name.DeepClone(), Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/Piping/PipingStochasticSoilModelCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/Piping/PipingStochasticSoilModelCreateExtensions.cs (.../PipingStochasticSoilModelCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/Piping/PipingStochasticSoilModelCreateExtensions.cs (.../PipingStochasticSoilModelCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -49,6 +49,7 @@ { throw new ArgumentNullException(nameof(model)); } + if (registry == null) { throw new ArgumentNullException(nameof(registry)); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/Piping/PipingSurfaceLineCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/Piping/PipingSurfaceLineCreateExtensions.cs (.../PipingSurfaceLineCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/Piping/PipingSurfaceLineCreateExtensions.cs (.../PipingSurfaceLineCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -49,6 +49,7 @@ { throw new ArgumentNullException(nameof(surfaceLine)); } + if (registry == null) { throw new ArgumentNullException(nameof(registry)); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/StabilityPointStructures/StabilityPointStructureCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/StabilityPointStructures/StabilityPointStructureCreateExtensions.cs (.../StabilityPointStructureCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/StabilityPointStructures/StabilityPointStructureCreateExtensions.cs (.../StabilityPointStructureCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -47,6 +47,7 @@ { throw new ArgumentNullException(nameof(registry)); } + if (registry.Contains(structure)) { return registry.Get(structure); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs (.../StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs (.../StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -76,6 +76,7 @@ { entity.HydraulicLocationEntity = calculationInput.HydraulicBoundaryLocation.Create(registry, 0); } + if (calculationInput.ForeshoreProfile != null) { entity.ForeshoreProfileEntity = calculationInput.ForeshoreProfile.Create(registry, 0); @@ -103,6 +104,7 @@ { entity.StabilityStoneCoverWaveConditionsOutputEntities.Add(output.CreateStabilityStoneCoverWaveConditionsOutputEntity(WaveConditionsOutputType.Blocks, i++)); } + foreach (WaveConditionsOutput output in calculation.Output.ColumnsOutput) { entity.StabilityStoneCoverWaveConditionsOutputEntities.Add(output.CreateStabilityStoneCoverWaveConditionsOutputEntity(WaveConditionsOutputType.Columns, i++)); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/StructuresCalculationCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/StructuresCalculationCreateExtensions.cs (.../StructuresCalculationCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/StructuresCalculationCreateExtensions.cs (.../StructuresCalculationCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -44,6 +44,7 @@ { throw new ArgumentNullException(nameof(entityToUpdate)); } + if (registry == null) { throw new ArgumentNullException(nameof(registry)); @@ -62,6 +63,7 @@ { entityToUpdate.ForeshoreProfileEntity = registry.Get(input.ForeshoreProfile); } + entityToUpdate.UseForeshore = Convert.ToByte(input.UseForeshore); entityToUpdate.UseBreakWater = Convert.ToByte(input.UseBreakWater); @@ -167,8 +169,8 @@ if (calculation.HasOutput) { entity.ClosingStructuresOutputEntities.Add(calculation - .Output - .Create()); + .Output + .Create()); } } @@ -230,8 +232,8 @@ if (calculation.HasOutput) { entity.HeightStructuresOutputEntities.Add(calculation - .Output - .Create()); + .Output + .Create()); } } @@ -345,8 +347,8 @@ if (calculation.HasOutput) { entity.StabilityPointStructuresOutputEntities.Add(calculation - .Output - .Create()); + .Output + .Create()); } } Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -70,14 +70,15 @@ } private static void SetInputParameters(WaveImpactAsphaltCoverWaveConditionsCalculationEntity entity, - AssessmentSectionCategoryWaveConditionsInput calculationInput, + AssessmentSectionCategoryWaveConditionsInput calculationInput, PersistenceRegistry registry) { HydraulicBoundaryLocation hydraulicBoundaryLocation = calculationInput.HydraulicBoundaryLocation; if (hydraulicBoundaryLocation != null) { entity.HydraulicLocationEntity = hydraulicBoundaryLocation.Create(registry, 0); } + if (calculationInput.ForeshoreProfile != null) { entity.ForeshoreProfileEntity = calculationInput.ForeshoreProfile.Create(registry, 0); @@ -96,7 +97,7 @@ entity.CategoryType = Convert.ToByte(calculationInput.CategoryType); } - private static void AddEntityForWaveImpactAsphaltCoverWaveConditionsOutput(WaveImpactAsphaltCoverWaveConditionsCalculation calculation, + private static void AddEntityForWaveImpactAsphaltCoverWaveConditionsOutput(WaveImpactAsphaltCoverWaveConditionsCalculation calculation, WaveImpactAsphaltCoverWaveConditionsCalculationEntity entity) { if (calculation.HasOutput) Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/DoubleConversionExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/DoubleConversionExtensions.cs (.../DoubleConversionExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/DoubleConversionExtensions.cs (.../DoubleConversionExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -42,6 +42,7 @@ { return null; } + return value; } @@ -58,6 +59,7 @@ { return double.NaN; } + return value.Value; } } Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/FingerprintHelper.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/FingerprintHelper.cs (.../FingerprintHelper.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/FingerprintHelper.cs (.../FingerprintHelper.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -81,6 +81,7 @@ { return false; } + // Note: Do not turn this into a linq query, as that is less performance optimal! for (var i = 0; i < array1.Length; i++) { @@ -89,6 +90,7 @@ return false; } } + return true; } Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/BackgroundDataEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/BackgroundDataEntityReadExtensions.cs (.../BackgroundDataEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/BackgroundDataEntityReadExtensions.cs (.../BackgroundDataEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -78,8 +78,8 @@ string preferredFormat = null; bool isConfigured = Convert.ToBoolean(Convert.ToInt16(backgroundDataMetaEntities - .Single(entity => entity.Key.Equals(BackgroundDataIdentifiers.IsConfigured)) - .Read().Value)); + .Single(entity => entity.Key.Equals(BackgroundDataIdentifiers.IsConfigured)) + .Read().Value)); if (isConfigured) { @@ -89,10 +89,12 @@ { sourceCapabilitiesUrl = backgroundDataMetaEntity.Read().Value; } + if (backgroundDataMetaEntity.Key.Equals(BackgroundDataIdentifiers.SelectedCapabilityIdentifier)) { selectedCapabilityIdentifier = backgroundDataMetaEntity.Read().Value; } + if (backgroundDataMetaEntity.Key.Equals(BackgroundDataIdentifiers.PreferredFormat)) { preferredFormat = backgroundDataMetaEntity.Read().Value; Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/CalculationGroupEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/CalculationGroupEntityReadExtensions.cs (.../CalculationGroupEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/CalculationGroupEntityReadExtensions.cs (.../CalculationGroupEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -60,6 +60,7 @@ { throw new ArgumentNullException(nameof(collector)); } + if (generalPipingInput == null) { throw new ArgumentNullException(nameof(generalPipingInput)); @@ -77,6 +78,7 @@ { group.Children.Add(childCalculationGroupEntity.ReadAsPipingCalculationGroup(collector, generalPipingInput)); } + var childCalculationEntity = childEntity as PipingCalculationEntity; if (childCalculationEntity != null) { @@ -116,6 +118,7 @@ { group.Children.Add(childCalculationGroupEntity.ReadAsMacroStabilityInwardsCalculationGroup(collector)); } + var childCalculationEntity = childEntity as MacroStabilityInwardsCalculationEntity; if (childCalculationEntity != null) { @@ -155,6 +158,7 @@ { group.Children.Add(childCalculationGroupEntity.ReadAsGrassCoverErosionInwardsCalculationGroup(collector)); } + var childCalculationEntity = childEntity as GrassCoverErosionInwardsCalculationEntity; if (childCalculationEntity != null) { @@ -194,6 +198,7 @@ { group.Children.Add(childCalculationGroupEntity.ReadAsGrassCoverErosionOutwardsWaveConditionsCalculationGroup(collector)); } + var childCalculationEntity = childEntity as GrassCoverErosionOutwardsWaveConditionsCalculationEntity; if (childCalculationEntity != null) { @@ -233,6 +238,7 @@ { group.Children.Add(childCalculationGroupEntity.ReadAsHeightStructuresCalculationGroup(collector)); } + var childCalculationEntity = childEntity as HeightStructuresCalculationEntity; if (childCalculationEntity != null) { @@ -272,6 +278,7 @@ { group.Children.Add(childCalculationGroupEntity.ReadAsClosingStructuresCalculationGroup(collector)); } + var childCalculationEntity = childEntity as ClosingStructuresCalculationEntity; if (childCalculationEntity != null) { @@ -311,6 +318,7 @@ { group.Children.Add(childCalculationGroupEntity.ReadAsStabilityPointStructuresCalculationGroup(collector)); } + var childCalculationEntity = childEntity as StabilityPointStructuresCalculationEntity; if (childCalculationEntity != null) { @@ -350,6 +358,7 @@ { group.Children.Add(childCalculationGroupEntity.ReadAsStabilityStoneCoverWaveConditionsCalculationGroup(collector)); } + var childCalculationEntity = childEntity as StabilityStoneCoverWaveConditionsCalculationEntity; if (childCalculationEntity != null) { @@ -389,6 +398,7 @@ { group.Children.Add(childCalculationGroupEntity.ReadAsWaveImpactAsphaltCoverWaveConditionsCalculationGroup(collector)); } + var childCalculationEntity = childEntity as WaveImpactAsphaltCoverWaveConditionsCalculationEntity; if (childCalculationEntity != null) { @@ -406,42 +416,52 @@ { sortedList.Add(groupEntity.Order, groupEntity); } + foreach (PipingCalculationEntity calculationEntity in entity.PipingCalculationEntities) { sortedList.Add(calculationEntity.Order, calculationEntity); } + foreach (GrassCoverErosionInwardsCalculationEntity calculationEntity in entity.GrassCoverErosionInwardsCalculationEntities) { sortedList.Add(calculationEntity.Order, calculationEntity); } + foreach (GrassCoverErosionOutwardsWaveConditionsCalculationEntity calculationEntity in entity.GrassCoverErosionOutwardsWaveConditionsCalculationEntities) { sortedList.Add(calculationEntity.Order, calculationEntity); } + foreach (HeightStructuresCalculationEntity calculationEntity in entity.HeightStructuresCalculationEntities) { sortedList.Add(calculationEntity.Order, calculationEntity); } + foreach (ClosingStructuresCalculationEntity calculationEntity in entity.ClosingStructuresCalculationEntities) { sortedList.Add(calculationEntity.Order, calculationEntity); } + foreach (StabilityPointStructuresCalculationEntity calculationEntity in entity.StabilityPointStructuresCalculationEntities) { sortedList.Add(calculationEntity.Order, calculationEntity); } + foreach (StabilityStoneCoverWaveConditionsCalculationEntity calculationEntity in entity.StabilityStoneCoverWaveConditionsCalculationEntities) { sortedList.Add(calculationEntity.Order, calculationEntity); } + foreach (WaveImpactAsphaltCoverWaveConditionsCalculationEntity calculationEntity in entity.WaveImpactAsphaltCoverWaveConditionsCalculationEntities) { sortedList.Add(calculationEntity.Order, calculationEntity); } + foreach (MacroStabilityInwardsCalculationEntity calculationEntity in entity.MacroStabilityInwardsCalculationEntities) { sortedList.Add(calculationEntity.Order, calculationEntity); } + return sortedList.Values; } } Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ClosingStructures/ClosingStructureEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ClosingStructures/ClosingStructureEntityReadExtensions.cs (.../ClosingStructureEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ClosingStructures/ClosingStructureEntityReadExtensions.cs (.../ClosingStructureEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -47,6 +47,7 @@ { throw new ArgumentNullException(nameof(collector)); } + if (collector.Contains(entity)) { return collector.Get(entity); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs (.../ClosingStructuresCalculationEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ClosingStructures/ClosingStructuresCalculationEntityReadExtensions.cs (.../ClosingStructuresCalculationEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -51,6 +51,7 @@ { throw new ArgumentNullException(nameof(collector)); } + if (collector.Contains(entity)) { return collector.Get(entity); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/DuneErosion/DuneLocationCalculationCollectionEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/DuneErosion/DuneLocationCalculationCollectionEntityReadExtensions.cs (.../DuneLocationCalculationCollectionEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/DuneErosion/DuneLocationCalculationCollectionEntityReadExtensions.cs (.../DuneLocationCalculationCollectionEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -61,14 +61,14 @@ throw new ArgumentNullException(nameof(collector)); } - Dictionary calculationsLookup = + Dictionary calculationsLookup = calculations.ToDictionary(calc => calc.DuneLocation, calc => calc); foreach (DuneLocationCalculationEntity calculationEntity in entity.DuneLocationCalculationEntities) { DuneLocation duneLocation = collector.Get(calculationEntity.DuneLocationEntity); DuneLocationCalculation calculation = calculationsLookup[duneLocation]; - + calculationEntity.Read(calculation); } } Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ForeshoreProfileEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ForeshoreProfileEntityReadExtensions.cs (.../ForeshoreProfileEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ForeshoreProfileEntityReadExtensions.cs (.../ForeshoreProfileEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -79,6 +79,7 @@ { return null; } + return new BreakWater((BreakWaterType) breakWaterType.Value, breakWaterHeight.ToNullAsNaN()); } } Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensions.cs (.../DikeProfileEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensions.cs (.../DikeProfileEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -49,6 +49,7 @@ { throw new ArgumentNullException(nameof(collector)); } + if (collector.Contains(entity)) { return collector.Get(entity); @@ -83,6 +84,7 @@ { return null; } + return new BreakWater((BreakWaterType) entity.BreakWaterType, entity.BreakWaterHeight.Value); } } Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensions.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -50,6 +50,7 @@ { throw new ArgumentNullException(nameof(collector)); } + if (collector.Contains(entity)) { return collector.Get(entity); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensions.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -48,6 +48,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return new GrassCoverErosionInwardsOutput(GetOvertoppingOutput(entity), GetDikeHeightOutput(entity), GetOvertoppingRateOutput(entity)); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/HeightStructures/HeightStructureEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/HeightStructures/HeightStructureEntityReadExtensions.cs (.../HeightStructureEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/HeightStructures/HeightStructureEntityReadExtensions.cs (.../HeightStructureEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -47,6 +47,7 @@ { throw new ArgumentNullException(nameof(collector)); } + if (collector.Contains(entity)) { return collector.Get(entity); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs (.../HeightStructuresCalculationEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs (.../HeightStructuresCalculationEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -51,6 +51,7 @@ { throw new ArgumentNullException(nameof(collector)); } + if (collector.Contains(entity)) { return collector.Get(entity); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/IllustrationPoints/FaultTreeIllustrationPointEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/IllustrationPoints/FaultTreeIllustrationPointEntityReadExtensions.cs (.../FaultTreeIllustrationPointEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/IllustrationPoints/FaultTreeIllustrationPointEntityReadExtensions.cs (.../FaultTreeIllustrationPointEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -84,6 +84,7 @@ { sortedList.Add(childEntity.Order, childEntity); } + foreach (SubMechanismIllustrationPointEntity childEntity in entity.SubMechanismIllustrationPointEntities .OrderBy(ip => ip.Order)) { Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/IllustrationPoints/IllustrationPointResultEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/IllustrationPoints/IllustrationPointResultEntityReadExtensions.cs (.../IllustrationPointResultEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/IllustrationPoints/IllustrationPointResultEntityReadExtensions.cs (.../IllustrationPointResultEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -45,6 +45,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return new IllustrationPointResult(entity.Description, entity.Value); } Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsSoilProfileOneDEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsSoilProfileOneDEntityReadExtensions.cs (.../MacroStabilityInwardsSoilProfileOneDEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsSoilProfileOneDEntityReadExtensions.cs (.../MacroStabilityInwardsSoilProfileOneDEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -50,6 +50,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (collector == null) { throw new ArgumentNullException(nameof(collector)); @@ -59,6 +60,7 @@ { return collector.Get(entity); } + IEnumerable layers = entity.MacroStabilityInwardsSoilLayerOneDEntities.OrderBy(sl => sl.Order) .Select(sl => sl.Read()) .ToArray(); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsSoilProfileTwoDEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsSoilProfileTwoDEntityReadExtensions.cs (.../MacroStabilityInwardsSoilProfileTwoDEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsSoilProfileTwoDEntityReadExtensions.cs (.../MacroStabilityInwardsSoilProfileTwoDEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -51,6 +51,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (collector == null) { throw new ArgumentNullException(nameof(collector)); @@ -60,6 +61,7 @@ { return collector.Get(entity); } + IEnumerable layers = entity.MacroStabilityInwardsSoilLayerTwoDEntities .OrderBy(sl => sl.Order) .Select(sl => sl.Read()) Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileEntityReadExtensions.cs (.../MacroStabilityInwardsStochasticSoilProfileEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilProfileEntityReadExtensions.cs (.../MacroStabilityInwardsStochasticSoilProfileEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -48,6 +48,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (collector == null) { throw new ArgumentNullException(nameof(collector)); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/Piping/PipingCalculationOutputEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/Piping/PipingCalculationOutputEntityReadExtensions.cs (.../PipingCalculationOutputEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/Piping/PipingCalculationOutputEntityReadExtensions.cs (.../PipingCalculationOutputEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -46,6 +46,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return new PipingOutput(new PipingOutput.ConstructionProperties { UpliftZValue = entity.UpliftZValue.ToNullAsNaN(), Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/Piping/PipingSoilProfileEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/Piping/PipingSoilProfileEntityReadExtensions.cs (.../PipingSoilProfileEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/Piping/PipingSoilProfileEntityReadExtensions.cs (.../PipingSoilProfileEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -47,6 +47,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (collector == null) { throw new ArgumentNullException(nameof(collector)); @@ -56,6 +57,7 @@ { return collector.Get(entity); } + IEnumerable layers = entity.PipingSoilLayerEntities.OrderBy(sl => sl.Order) .Select(sl => sl.Read()) .ToArray(); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/Piping/PipingStochasticSoilProfileEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/Piping/PipingStochasticSoilProfileEntityReadExtensions.cs (.../PipingStochasticSoilProfileEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/Piping/PipingStochasticSoilProfileEntityReadExtensions.cs (.../PipingStochasticSoilProfileEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -48,6 +48,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (collector == null) { throw new ArgumentNullException(nameof(collector)); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ProjectEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ProjectEntityReadExtensions.cs (.../ProjectEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ProjectEntityReadExtensions.cs (.../ProjectEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -45,6 +45,7 @@ { throw new ArgumentNullException(nameof(collector)); } + var project = new RingtoetsProject { Description = entity.Description Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ReadConversionCollector.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ReadConversionCollector.cs (.../ReadConversionCollector.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ReadConversionCollector.cs (.../ReadConversionCollector.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -128,6 +128,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -148,6 +149,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return pipingStochasticSoilModels.ContainsKey(entity); } @@ -168,6 +170,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return pipingStochasticSoilModels[entity]; @@ -191,6 +194,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -211,6 +215,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return macroStabilityInwardsStochasticSoilModels.ContainsKey(entity); } @@ -232,6 +237,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return macroStabilityInwardsStochasticSoilModels[entity]; @@ -259,6 +265,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -279,6 +286,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return pipingStochasticSoilProfiles.ContainsKey(entity); } @@ -300,6 +308,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return pipingStochasticSoilProfiles[entity]; @@ -327,6 +336,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -347,6 +357,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return pipingSoilProfiles.ContainsKey(entity); } @@ -367,6 +378,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return pipingSoilProfiles[entity]; @@ -394,6 +406,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -414,6 +427,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return pipingSurfaceLines.ContainsKey(entity); } @@ -435,6 +449,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return pipingSurfaceLines[entity]; @@ -458,6 +473,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -478,6 +494,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return macroStabilityInwardsSurfaceLines.ContainsKey(entity); } @@ -499,6 +516,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return macroStabilityInwardsSurfaceLines[entity]; @@ -526,6 +544,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -546,6 +565,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return macroStabilityInwardsStochasticSoilProfiles.ContainsKey(entity); } @@ -567,6 +587,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return macroStabilityInwardsStochasticSoilProfiles[entity]; @@ -594,6 +615,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -614,6 +636,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return macroStabilityInwardsSoil1DProfiles.ContainsKey(entity); } @@ -635,6 +658,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return macroStabilityInwardsSoil1DProfiles[entity]; @@ -662,6 +686,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -682,6 +707,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return macroStabilityInwardsSoil2DProfiles.ContainsKey(entity); } @@ -703,6 +729,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return macroStabilityInwardsSoil2DProfiles[entity]; @@ -730,6 +757,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -750,6 +778,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return hydraulicBoundaryLocations.ContainsKey(entity); } @@ -771,6 +800,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return hydraulicBoundaryLocations[entity]; @@ -798,6 +828,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -818,6 +849,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return duneLocations.ContainsKey(entity); } @@ -839,6 +871,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return duneLocations[entity]; @@ -866,6 +899,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -886,6 +920,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return failureMechanismSections.ContainsKey(entity); } @@ -907,6 +942,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return failureMechanismSections[entity]; @@ -934,6 +970,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -954,6 +991,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return dikeProfiles.ContainsKey(entity); } @@ -975,6 +1013,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return dikeProfiles[entity]; @@ -1002,6 +1041,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -1022,6 +1062,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return foreshoreProfiles.ContainsKey(entity); } @@ -1043,6 +1084,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return foreshoreProfiles[entity]; @@ -1073,6 +1115,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -1093,6 +1136,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return grassCoverErosionInwardsCalculations.ContainsKey(entity); } @@ -1114,6 +1158,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return grassCoverErosionInwardsCalculations[entity]; @@ -1141,6 +1186,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -1161,6 +1207,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return heightStructures.ContainsKey(entity); } @@ -1182,6 +1229,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return heightStructures[entity]; @@ -1212,6 +1260,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -1232,6 +1281,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return heightStructuresCalculations.ContainsKey(entity); } @@ -1253,6 +1303,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return heightStructuresCalculations[entity]; @@ -1280,6 +1331,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -1300,6 +1352,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return closingStructures.ContainsKey(entity); } @@ -1321,6 +1374,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return closingStructures[entity]; @@ -1351,6 +1405,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -1371,6 +1426,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return closingStructuresCalculations.ContainsKey(entity); } @@ -1392,6 +1448,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return closingStructuresCalculations[entity]; @@ -1419,6 +1476,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -1439,6 +1497,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return stabilityPointStructures.ContainsKey(entity); } @@ -1460,6 +1519,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return stabilityPointStructures[entity]; @@ -1490,6 +1550,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (model == null) { throw new ArgumentNullException(nameof(model)); @@ -1510,6 +1571,7 @@ { throw new ArgumentNullException(nameof(entity)); } + return stabilityPointStructuresCalculations.ContainsKey(entity); } @@ -1531,6 +1593,7 @@ { throw new ArgumentNullException(nameof(entity)); } + try { return stabilityPointStructuresCalculations[entity]; Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensions.cs (.../StabilityPointStructureEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensions.cs (.../StabilityPointStructureEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -47,6 +47,7 @@ { throw new ArgumentNullException(nameof(collector)); } + if (collector.Contains(entity)) { return collector.Get(entity); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensions.cs (.../StabilityPointStructuresCalculationEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensions.cs (.../StabilityPointStructuresCalculationEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -51,6 +51,7 @@ { throw new ArgumentNullException(nameof(collector)); } + if (collector.Contains(entity)) { return collector.Get(entity); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs (.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs (.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -73,8 +73,8 @@ return calculation; } - private static void ReadCalculationInputs(AssessmentSectionCategoryWaveConditionsInput inputParameters, - StabilityStoneCoverWaveConditionsCalculationEntity entity, + private static void ReadCalculationInputs(AssessmentSectionCategoryWaveConditionsInput inputParameters, + StabilityStoneCoverWaveConditionsCalculationEntity entity, ReadConversionCollector collector) { inputParameters.ForeshoreProfile = GetDikeProfileValue(entity.ForeshoreProfileEntity, collector); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StochasticSoilModelEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StochasticSoilModelEntityReadExtensions.cs (.../StochasticSoilModelEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StochasticSoilModelEntityReadExtensions.cs (.../StochasticSoilModelEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -55,6 +55,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (collector == null) { throw new ArgumentNullException(nameof(collector)); @@ -91,6 +92,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (collector == null) { throw new ArgumentNullException(nameof(collector)); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/SurfaceLineEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/SurfaceLineEntityReadExtensions.cs (.../SurfaceLineEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/SurfaceLineEntityReadExtensions.cs (.../SurfaceLineEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -59,6 +59,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (collector == null) { throw new ArgumentNullException(nameof(collector)); @@ -105,6 +106,7 @@ { throw new ArgumentNullException(nameof(entity)); } + if (collector == null) { throw new ArgumentNullException(nameof(collector)); @@ -180,7 +182,6 @@ characteristicPoints.ForEachElementDo(cp => SetCharacteristicPoint(surfaceLine, cp.Key, cp.Value)); } - /// /// Sets the characteristic point and its coordinate to the . /// Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -46,7 +46,7 @@ /// The object keeping track of read operations. /// A new . /// Thrown when any parameter is null. - internal static WaveImpactAsphaltCoverWaveConditionsCalculation Read(this WaveImpactAsphaltCoverWaveConditionsCalculationEntity entity, + internal static WaveImpactAsphaltCoverWaveConditionsCalculation Read(this WaveImpactAsphaltCoverWaveConditionsCalculationEntity entity, ReadConversionCollector collector) { if (entity == null) Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/RoundedDoubleConversionExtensions.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/RoundedDoubleConversionExtensions.cs (.../RoundedDoubleConversionExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/RoundedDoubleConversionExtensions.cs (.../RoundedDoubleConversionExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -43,6 +43,7 @@ { return null; } + return value; } } Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Serializers/DataCollectionSerializer.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Serializers/DataCollectionSerializer.cs (.../DataCollectionSerializer.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Serializers/DataCollectionSerializer.cs (.../DataCollectionSerializer.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -63,6 +63,7 @@ formatter.WriteObject(writer, ToSerializableData(elements)); writer.Flush(); } + using (var streamReader = new StreamReader(memoryStream)) { memoryStream.Seek(0, SeekOrigin.Begin); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/SqLiteEntityConnectionStringBuilder.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/SqLiteEntityConnectionStringBuilder.cs (.../SqLiteEntityConnectionStringBuilder.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/SqLiteEntityConnectionStringBuilder.cs (.../SqLiteEntityConnectionStringBuilder.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -42,6 +42,7 @@ { throw new ArgumentNullException(nameof(filePath), @"Cannot create a connection string without the path to the file to connect to."); } + return new EntityConnectionStringBuilder { Metadata = string.Format(@"res://*/{0}.csdl|res://*/{0}.ssdl|res://*/{0}.msl", "DbContext.RingtoetsEntities"), Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/StorageSqLite.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/StorageSqLite.cs (.../StorageSqLite.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/StorageSqLite.cs (.../StorageSqLite.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -73,6 +73,7 @@ { throw new ArgumentNullException(nameof(project)); } + var registry = new PersistenceRegistry(); stagedProject = new StagedProject(ringtoetsProject, ringtoetsProject.Create(registry)); @@ -153,6 +154,7 @@ { throw new InvalidOperationException("Call 'StageProject(IProject)' first before calling this method."); } + if (string.IsNullOrWhiteSpace(filePath)) { return true; @@ -174,6 +176,7 @@ { throw new StorageException(Resources.StorageSqLite_HasStagedProjectChanges_Project_contains_too_many_objects_to_generate_fingerprint, e); } + throw new StorageException(e.Message, e); } } @@ -208,8 +211,10 @@ { throw CreateStorageWriterException(databaseFilePath, Resources.Error_during_connection, exception); } + throw; } + stagedProject.Model.Name = Path.GetFileNameWithoutExtension(databaseFilePath); } } @@ -316,6 +321,7 @@ throw new StorageValidationException(message, exception); } } + return connectionString; } Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/CalculationGroupCreateExtensionsTest.cs =================================================================== diff -u -r89e98516d0d77726bca56a95d649bb7a3e3333bc -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/CalculationGroupCreateExtensionsTest.cs (.../CalculationGroupCreateExtensionsTest.cs) (revision 89e98516d0d77726bca56a95d649bb7a3e3333bc) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/CalculationGroupCreateExtensionsTest.cs (.../CalculationGroupCreateExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -32,9 +32,9 @@ using Ringtoets.Piping.Data; using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityStoneCover.Data; -using Ringtoets.WaveImpactAsphaltCover.Data; using Ringtoets.Storage.Core.Create; using Ringtoets.Storage.Core.DbContext; +using Ringtoets.WaveImpactAsphaltCover.Data; namespace Ringtoets.Storage.Core.Test.Create { Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensionsTest.cs (.../DuneErosionFailureMechanismCreateExtensionsTest.cs) (revision 6c8de1309c92e793410baf799ac85db84bed9463) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensionsTest.cs (.../DuneErosionFailureMechanismCreateExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -206,7 +206,7 @@ } private static void AssertDuneLocationCalculationCollectionEntities(DuneErosionFailureMechanism failureMechanism, - PersistenceRegistry registry, + PersistenceRegistry registry, DuneErosionFailureMechanismMetaEntity metaEntity) { AssertDuneLocationCalculationCollectionEntity(failureMechanism.CalculationsForFactorizedLowerLimitNorm, @@ -248,7 +248,7 @@ } private static void AssertDuneLocationCalculationCollectionEntity(IEnumerable expectedCalculations, - PersistenceRegistry registry, + PersistenceRegistry registry, DuneLocationCalculationCollectionEntity actualCollectionEntity) { Assert.IsNotNull(actualCollectionEntity); Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/DuneErosion/DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/DuneErosion/DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs (.../DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 6c8de1309c92e793410baf799ac85db84bed9463) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/DuneErosion/DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs (.../DuneErosionFailureMechanismSectionResultCreateExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -25,8 +25,8 @@ using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Primitives; using Ringtoets.DuneErosion.Data; -using Ringtoets.Storage.Core.DbContext; using Ringtoets.Storage.Core.Create.DuneErosion; +using Ringtoets.Storage.Core.DbContext; using Ringtoets.Storage.Core.TestUtil; namespace Ringtoets.Storage.Core.Test.Create.DuneErosion Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/DuneErosion/DuneLocationCreateExtensionsTest.cs =================================================================== diff -u -rc56afb06a181100c99dd6e1770f350306cdca48d -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/DuneErosion/DuneLocationCreateExtensionsTest.cs (.../DuneLocationCreateExtensionsTest.cs) (revision c56afb06a181100c99dd6e1770f350306cdca48d) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/DuneErosion/DuneLocationCreateExtensionsTest.cs (.../DuneLocationCreateExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -38,7 +38,7 @@ public void Create_DuneLocationNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => ((DuneLocation)null).Create(new PersistenceRegistry(), 0); + TestDelegate call = () => ((DuneLocation) null).Create(new PersistenceRegistry(), 0); // Assert var exception = Assert.Throws(call); Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionInwards/DikeHeightOutputCreateExtensionsTest.cs =================================================================== diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionInwards/DikeHeightOutputCreateExtensionsTest.cs (.../DikeHeightOutputCreateExtensionsTest.cs) (revision 6c8de1309c92e793410baf799ac85db84bed9463) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionInwards/DikeHeightOutputCreateExtensionsTest.cs (.../DikeHeightOutputCreateExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -26,8 +26,8 @@ using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Data.TestUtil.IllustrationPoints; using Ringtoets.GrassCoverErosionInwards.Data; -using Ringtoets.Storage.Core.DbContext; using Ringtoets.Storage.Core.Create.GrassCoverErosionInwards; +using Ringtoets.Storage.Core.DbContext; using Ringtoets.Storage.Core.TestUtil.IllustrationPoints; namespace Ringtoets.Storage.Core.Test.Create.GrassCoverErosionInwards Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionInwards/OvertoppingRateOutputCreateExtensionsTest.cs =================================================================== diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionInwards/OvertoppingRateOutputCreateExtensionsTest.cs (.../OvertoppingRateOutputCreateExtensionsTest.cs) (revision 6c8de1309c92e793410baf799ac85db84bed9463) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionInwards/OvertoppingRateOutputCreateExtensionsTest.cs (.../OvertoppingRateOutputCreateExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -26,8 +26,8 @@ using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Data.TestUtil.IllustrationPoints; using Ringtoets.GrassCoverErosionInwards.Data; -using Ringtoets.Storage.Core.DbContext; using Ringtoets.Storage.Core.Create.GrassCoverErosionInwards; +using Ringtoets.Storage.Core.DbContext; using Ringtoets.Storage.Core.TestUtil.IllustrationPoints; namespace Ringtoets.Storage.Core.Test.Create.GrassCoverErosionInwards Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 6c8de1309c92e793410baf799ac85db84bed9463) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -25,8 +25,8 @@ using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Primitives; using Ringtoets.GrassCoverErosionOutwards.Data; -using Ringtoets.Storage.Core.DbContext; using Ringtoets.Storage.Core.Create.GrassCoverErosionOutwards; +using Ringtoets.Storage.Core.DbContext; using Ringtoets.Storage.Core.TestUtil; namespace Ringtoets.Storage.Core.Test.Create.GrassCoverErosionOutwards Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/HydraulicBoundaryLocationCalculationCollectionCreateExtensionsTest.cs =================================================================== diff -u -r43ef1ae3ee00625224dfbe0206bc91cbfe5fe333 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/HydraulicBoundaryLocationCalculationCollectionCreateExtensionsTest.cs (.../HydraulicBoundaryLocationCalculationCollectionCreateExtensionsTest.cs) (revision 43ef1ae3ee00625224dfbe0206bc91cbfe5fe333) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/HydraulicBoundaryLocationCalculationCollectionCreateExtensionsTest.cs (.../HydraulicBoundaryLocationCalculationCollectionCreateExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -39,7 +39,7 @@ public void Create_CalculationsNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => + TestDelegate call = () => ((IEnumerable) null).Create(new PersistenceRegistry()); // Assert Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs) (revision 6c8de1309c92e793410baf799ac85db84bed9463) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -309,6 +309,7 @@ { geometryPoints[i] = new Point3D(random.NextDouble(), random.NextDouble(), random.NextDouble()); } + surfaceLine.SetGeometry(geometryPoints); surfaceLine.SetDitchPolderSideAt(geometryPoints[1]); Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/PersistenceRegistryTest.cs =================================================================== diff -u -r6c8de1309c92e793410baf799ac85db84bed9463 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision 6c8de1309c92e793410baf799ac85db84bed9463) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -93,10 +93,12 @@ { throw new ArgumentNullException(nameof(registerToRegistry)); } + if (containsInRegistry == null) { throw new ArgumentNullException(nameof(containsInRegistry)); } + if (getFromRegistry == null) { throw new ArgumentNullException(nameof(getFromRegistry)); Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/DuneErosion/DuneErosionFailureMechanismMetaEntityReadExtensionsTest.cs =================================================================== diff -u -rd25cbe554fc1e9e9122a99345ff5b8d4e171e8ef -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/DuneErosion/DuneErosionFailureMechanismMetaEntityReadExtensionsTest.cs (.../DuneErosionFailureMechanismMetaEntityReadExtensionsTest.cs) (revision d25cbe554fc1e9e9122a99345ff5b8d4e171e8ef) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/DuneErosion/DuneErosionFailureMechanismMetaEntityReadExtensionsTest.cs (.../DuneErosionFailureMechanismMetaEntityReadExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -24,8 +24,8 @@ using NUnit.Framework; using Ringtoets.Common.Data.TestUtil; using Ringtoets.DuneErosion.Data; -using Ringtoets.Storage.Core.Read.DuneErosion; using Ringtoets.Storage.Core.DbContext; +using Ringtoets.Storage.Core.Read.DuneErosion; namespace Ringtoets.Storage.Core.Test.Read.DuneErosion { Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensionsTest.cs =================================================================== diff -u -r9648bb4ef6c0bd5338491372fce48f378ab796c5 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensionsTest.cs (.../DikeProfileEntityReadExtensionsTest.cs) (revision 9648bb4ef6c0bd5338491372fce48f378ab796c5) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensionsTest.cs (.../DikeProfileEntityReadExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -241,6 +241,7 @@ { return 0; } + return 1; } } Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs) (revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -50,7 +50,7 @@ { WaveHeight = 1.1, IsOvertoppingDominant = Convert.ToByte(false), - Reliability = 0.2, + Reliability = 0.2 }; // Call Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs (.../GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs) (revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs (.../GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -72,7 +72,7 @@ var tailorMadeAssessmentResult = random.NextEnumValue(); bool useManualAssemblyCategoryGroup = random.NextBoolean(); var manualAssemblyCategoryGroup = random.NextEnumValue(); - + var entity = new GrassCoverSlipOffOutwardsSectionResultEntity { SimpleAssessmentResult = Convert.ToByte(simpleAssessmentResult), Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationOutputEntityReadExtensionsTest.cs (.../MacroStabilityInwardsCalculationOutputEntityReadExtensionsTest.cs) (revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationOutputEntityReadExtensionsTest.cs (.../MacroStabilityInwardsCalculationOutputEntityReadExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -27,8 +27,8 @@ using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.Storage.Core.DbContext; -using Ringtoets.Storage.Core.Serializers; using Ringtoets.Storage.Core.Read.MacroStabilityInwards; +using Ringtoets.Storage.Core.Serializers; using Ringtoets.Storage.Core.TestUtil.MacroStabilityInwards; namespace Ringtoets.Storage.Core.Test.Read.MacroStabilityInwards Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs =================================================================== diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs) (revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -28,8 +28,8 @@ using Ringtoets.MacroStabilityInwards.Primitives; using Ringtoets.MacroStabilityInwards.Primitives.TestUtil; using Ringtoets.Storage.Core.DbContext; -using Ringtoets.Storage.Core.Serializers; using Ringtoets.Storage.Core.Read.MacroStabilityInwards; +using Ringtoets.Storage.Core.Serializers; using Ringtoets.Storage.Core.TestUtil.MacroStabilityInwards; namespace Ringtoets.Storage.Core.Test.Read.MacroStabilityInwards Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs (.../MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs) (revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityOutwards/MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs (.../MacroStabilityOutwardsSectionResultEntityReadExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -74,7 +74,7 @@ double tailorMadeAssessmentProbability = random.NextDouble(); bool useManualAssemblyCategoryGroup = random.NextBoolean(); var manualAssemblyCategoryGroup = random.NextEnumValue(); - + var entity = new MacroStabilityOutwardsSectionResultEntity { SimpleAssessmentResult = Convert.ToByte(simpleAssessmentResult), Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ReadConversionCollectorTest.cs =================================================================== diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ReadConversionCollectorTest.cs (.../ReadConversionCollectorTest.cs) (revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ReadConversionCollectorTest.cs (.../ReadConversionCollectorTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -93,10 +93,12 @@ { throw new ArgumentNullException(nameof(registerToCollector)); } + if (containsInCollector == null) { throw new ArgumentNullException(nameof(containsInCollector)); } + if (getFromCollector == null) { throw new ArgumentNullException(nameof(getFromCollector)); Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StochasticSoilModelEntityReadExtensionsTest.cs =================================================================== diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StochasticSoilModelEntityReadExtensionsTest.cs (.../StochasticSoilModelEntityReadExtensionsTest.cs) (revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StochasticSoilModelEntityReadExtensionsTest.cs (.../StochasticSoilModelEntityReadExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -21,15 +21,15 @@ using System; using System.Linq; -using Ringtoets.Storage.Core.TestUtil; -using Ringtoets.Storage.Core.TestUtil.MacroStabilityInwards; using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.MacroStabilityInwards.Data.SoilProfile; using Ringtoets.Piping.Data.SoilProfile; using Ringtoets.Storage.Core.DbContext; using Ringtoets.Storage.Core.Read; using Ringtoets.Storage.Core.Serializers; +using Ringtoets.Storage.Core.TestUtil; +using Ringtoets.Storage.Core.TestUtil.MacroStabilityInwards; namespace Ringtoets.Storage.Core.Test.Read { Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Serializers/RoughnessPointXmlSerializerTest.cs =================================================================== diff -u -r228865ccc3e9aa485f6497ef7b2bb70766120122 -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Serializers/RoughnessPointXmlSerializerTest.cs (.../RoughnessPointXmlSerializerTest.cs) (revision 228865ccc3e9aa485f6497ef7b2bb70766120122) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Serializers/RoughnessPointXmlSerializerTest.cs (.../RoughnessPointXmlSerializerTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -76,6 +76,7 @@ { return 0; } + return 1; } } Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/IllustrationPoints/GeneralResultEntityTestHelper.cs =================================================================== diff -u -r9f9b2d503356070586ff78bdfb735d8730deaa6e -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/IllustrationPoints/GeneralResultEntityTestHelper.cs (.../GeneralResultEntityTestHelper.cs) (revision 9f9b2d503356070586ff78bdfb735d8730deaa6e) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/IllustrationPoints/GeneralResultEntityTestHelper.cs (.../GeneralResultEntityTestHelper.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -56,6 +56,7 @@ { throw new ArgumentNullException(nameof(generalResult)); } + if (generalResultEntity == null) { throw new ArgumentNullException(nameof(generalResultEntity)); Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs =================================================================== diff -u -r9f9b2d503356070586ff78bdfb735d8730deaa6e -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs (.../MacroStabilityInwardsCalculationEntityTestHelper.cs) (revision 9f9b2d503356070586ff78bdfb735d8730deaa6e) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityTestHelper.cs (.../MacroStabilityInwardsCalculationEntityTestHelper.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -59,6 +59,7 @@ { throw new ArgumentNullException(nameof(scenario)); } + if (entity == null) { throw new ArgumentNullException(nameof(entity)); Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationOutputEntityTestHelper.cs =================================================================== diff -u -r9f9b2d503356070586ff78bdfb735d8730deaa6e -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationOutputEntityTestHelper.cs (.../MacroStabilityInwardsCalculationOutputEntityTestHelper.cs) (revision 9f9b2d503356070586ff78bdfb735d8730deaa6e) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsCalculationOutputEntityTestHelper.cs (.../MacroStabilityInwardsCalculationOutputEntityTestHelper.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -52,6 +52,7 @@ { throw new ArgumentNullException(nameof(output)); } + if (entity == null) { throw new ArgumentNullException(nameof(entity)); Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/SqLiteDatabaseHelper.cs =================================================================== diff -u -r9f9b2d503356070586ff78bdfb735d8730deaa6e -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/SqLiteDatabaseHelper.cs (.../SqLiteDatabaseHelper.cs) (revision 9f9b2d503356070586ff78bdfb735d8730deaa6e) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/SqLiteDatabaseHelper.cs (.../SqLiteDatabaseHelper.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554) @@ -94,6 +94,7 @@ { throw new ArgumentNullException(nameof(databaseSchemaQuery)); } + if (string.IsNullOrWhiteSpace(databaseFilePath)) { throw new ArgumentNullException(nameof(databaseFilePath));