Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 30-Jan-2018 14:00:08 */ +/* Created On : 30-jan-2018 14:54:26 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -922,6 +922,7 @@ 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismEntityId' INTEGER NOT NULL, 'ForeshoreProfileCollectionSourcePath' TEXT, + 'DeltaL' REAL NOT NULL, CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -181,7 +181,16 @@ [FingerPrint] FROM [SOURCEPROJECT].VersionEntity; INSERT INTO WaterPressureAsphaltCoverSectionResultEntity SELECT * FROM [SOURCEPROJECT].WaterPressureAsphaltCoverSectionResultEntity; -INSERT INTO WaveImpactAsphaltCoverFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].WaveImpactAsphaltCoverFailureMechanismMetaEntity; +INSERT INTO WaveImpactAsphaltCoverFailureMechanismMetaEntity ( + [WaveImpactAsphaltCoverFailureMechanismMetaEntityId], + [FailureMechanismEntityId], + [ForeshoreProfileCollectionSourcePath], + [DeltaL]) +SELECT [WaveImpactAsphaltCoverFailureMechanismMetaEntityId], + [FailureMechanismEntityId], + [ForeshoreProfileCollectionSourcePath], + "1000" +FROM [SOURCEPROJECT].WaveImpactAsphaltCoverFailureMechanismMetaEntity; INSERT INTO WaveImpactAsphaltCoverSectionResultEntity SELECT * FROM [SOURCEPROJECT].WaveImpactAsphaltCoverSectionResultEntity; INSERT INTO WaveImpactAsphaltCoverWaveConditionsCalculationEntity SELECT * FROM [SOURCEPROJECT].WaveImpactAsphaltCoverWaveConditionsCalculationEntity; INSERT INTO WaveImpactAsphaltCoverWaveConditionsOutputEntity SELECT * FROM [SOURCEPROJECT].WaveImpactAsphaltCoverWaveConditionsOutputEntity; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -412,6 +412,7 @@ + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -68,7 +68,8 @@ { var metaEntity = new WaveImpactAsphaltCoverFailureMechanismMetaEntity { - ForeshoreProfileCollectionSourcePath = failureMechanism.ForeshoreProfiles.SourcePath.DeepClone() + ForeshoreProfileCollectionSourcePath = failureMechanism.ForeshoreProfiles.SourcePath.DeepClone(), + DeltaL = failureMechanism.GeneralWaveImpactAsphaltCoverInput.DeltaL }; entity.WaveImpactAsphaltCoverFailureMechanismMetaEntities.Add(metaEntity); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -1,4 +1,25 @@ -// T4 code generation is enabled for model 'C:\Dev\Git\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +// T4 code generation is enabled for model 'C:\RingtoetsGIT\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model // is open in the designer. Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -4,7 +4,7 @@ - + @@ -1471,6 +1471,7 @@ + @@ -6282,6 +6283,7 @@ + @@ -9487,6 +9489,7 @@ + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -336,100 +336,100 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - + + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverFailureMechanismMetaEntity.cs =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverFailureMechanismMetaEntity.cs (.../WaveImpactAsphaltCoverFailureMechanismMetaEntity.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverFailureMechanismMetaEntity.cs (.../WaveImpactAsphaltCoverFailureMechanismMetaEntity.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -35,6 +35,7 @@ public long WaveImpactAsphaltCoverFailureMechanismMetaEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public string ForeshoreProfileCollectionSourcePath { get; set; } + public double DeltaL { get; set; } public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructures/ClosingStructuresFailureMechanismMetaEntityReadExtensions.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructures/ClosingStructuresFailureMechanismMetaEntityReadExtensions.cs (.../ClosingStructuresFailureMechanismMetaEntityReadExtensions.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructures/ClosingStructuresFailureMechanismMetaEntityReadExtensions.cs (.../ClosingStructuresFailureMechanismMetaEntityReadExtensions.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using Application.Ringtoets.Storage.DbContext; using Ringtoets.ClosingStructures.Data; @@ -37,8 +38,14 @@ /// The /// to create for. /// A new . + /// Thrown when is null. internal static GeneralClosingStructuresInput Read(this ClosingStructuresFailureMechanismMetaEntity entity) { + if (entity == null) + { + throw new ArgumentNullException(nameof(entity)); + } + return new GeneralClosingStructuresInput { N2A = entity.N2A Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneErosionFailureMechanismMetaEntityReadExtensions.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneErosionFailureMechanismMetaEntityReadExtensions.cs (.../DuneErosionFailureMechanismMetaEntityReadExtensions.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneErosionFailureMechanismMetaEntityReadExtensions.cs (.../DuneErosionFailureMechanismMetaEntityReadExtensions.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -40,13 +40,19 @@ /// to use to update the . /// The to be updated. /// A new . - /// Thrown when is null. + /// Thrown when any input parameter is null. internal static void Read(this DuneErosionFailureMechanismMetaEntity entity, GeneralDuneErosionInput input) { + if (entity == null) + { + throw new ArgumentNullException(nameof(entity)); + } + if (input == null) { throw new ArgumentNullException(nameof(input)); } + input.N = (RoundedDouble) entity.N; } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -r899d227631395ebeb5154719f7b92a42ddbc6f96 -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -653,6 +653,7 @@ entity.ReadForeshoreProfiles(failureMechanism.ForeshoreProfiles, metaEntity.ForeshoreProfileCollectionSourcePath, collector); ReadWaveImpactAsphaltCoverRootCalculationGroup(entity.CalculationGroupEntity, failureMechanism.WaveConditionsCalculationGroup, collector); + failureMechanism.GeneralWaveImpactAsphaltCoverInput.DeltaL = (RoundedDouble) entity.WaveImpactAsphaltCoverFailureMechanismMetaEntities.Single().DeltaL; } private static void ReadWaveImpactAsphaltCoverMechanismSectionResults(this FailureMechanismEntity entity, Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensions.cs =================================================================== diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensions.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensions.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -39,9 +39,14 @@ /// The /// to use to update the . /// The to be updated. - /// Thrown when is null. + /// Thrown when any input parameter is null. internal static void Read(this GrassCoverErosionInwardsFailureMechanismMetaEntity entity, GeneralGrassCoverErosionInwardsInput input) { + if (entity == null) + { + throw new ArgumentNullException(nameof(entity)); + } + if (input == null) { throw new ArgumentNullException(nameof(input)); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensions.cs =================================================================== diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensions.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensions.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -40,9 +40,14 @@ /// to create for. /// The to be updated. /// A new . - /// Thrown when is null. + /// Thrown when any input parameter is null. internal static void Read(this GrassCoverErosionOutwardsFailureMechanismMetaEntity entity, GeneralGrassCoverErosionOutwardsInput input) { + if (entity == null) + { + throw new ArgumentNullException(nameof(entity)); + } + if (input == null) { throw new ArgumentNullException(nameof(input)); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructures/HeightStructuresFailureMechanismMetaEntityReadExtensions.cs =================================================================== diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructures/HeightStructuresFailureMechanismMetaEntityReadExtensions.cs (.../HeightStructuresFailureMechanismMetaEntityReadExtensions.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructures/HeightStructuresFailureMechanismMetaEntityReadExtensions.cs (.../HeightStructuresFailureMechanismMetaEntityReadExtensions.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using Application.Ringtoets.Storage.DbContext; using Core.Common.Base.Data; using Ringtoets.HeightStructures.Data; @@ -38,8 +39,14 @@ /// The /// to create for. /// A new . + /// Thrown when is null. internal static GeneralHeightStructuresInput Read(this HeightStructuresFailureMechanismMetaEntity entity) { + if (entity == null) + { + throw new ArgumentNullException(nameof(entity)); + } + return new GeneralHeightStructuresInput { N = (RoundedDouble) entity.N Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismMetaEntityReadExtensions.cs =================================================================== diff -u -r75239d2d2d30777d12795d21bb0a2c4079009276 -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismMetaEntityReadExtensions.cs (.../MacroStabilityInwardsFailureMechanismMetaEntityReadExtensions.cs) (revision 75239d2d2d30777d12795d21bb0a2c4079009276) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismMetaEntityReadExtensions.cs (.../MacroStabilityInwardsFailureMechanismMetaEntityReadExtensions.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -40,13 +40,14 @@ /// The /// to set the properties of . /// Thrown when any input parameter is null. - public static void ReadProbabilityAssessmentInput(this MacroStabilityInwardsFailureMechanismMetaEntity entity, - MacroStabilityInwardsProbabilityAssessmentInput probabilityAssessmentInput) + internal static void ReadProbabilityAssessmentInput(this MacroStabilityInwardsFailureMechanismMetaEntity entity, + MacroStabilityInwardsProbabilityAssessmentInput probabilityAssessmentInput) { if (entity == null) { throw new ArgumentNullException(nameof(entity)); } + if (probabilityAssessmentInput == null) { throw new ArgumentNullException(nameof(probabilityAssessmentInput)); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensions.cs =================================================================== diff -u -r3aae00632d922ad6a995a79de25ff4da07e6b57a -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensions.cs (.../MacroStabilityInwardsSectionResultEntityReadExtensions.cs) (revision 3aae00632d922ad6a995a79de25ff4da07e6b57a) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSectionResultEntityReadExtensions.cs (.../MacroStabilityInwardsSectionResultEntityReadExtensions.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -40,7 +40,7 @@ /// update the for. /// The target of the read operation. /// Thrown when any parameter is null. - public static void Read(this MacroStabilityInwardsSectionResultEntity entity, MacroStabilityInwardsFailureMechanismSectionResult sectionResult) + internal static void Read(this MacroStabilityInwardsSectionResultEntity entity, MacroStabilityInwardsFailureMechanismSectionResult sectionResult) { if (entity == null) { Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityOutwards/MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensions.cs =================================================================== diff -u -r36d4b4090a4169cc8d25ede0029a3244df8fe74d -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityOutwards/MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensions.cs (.../MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensions.cs) (revision 36d4b4090a4169cc8d25ede0029a3244df8fe74d) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityOutwards/MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensions.cs (.../MacroStabilityOutwardsFailureMechanismMetaEntityReadExtensions.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -40,7 +40,7 @@ /// The /// to set the properties of . /// Thrown when any input parameter is null. - public static void ReadProbabilityAssessmentInput(this MacroStabilityOutwardsFailureMechanismMetaEntity entity, + internal static void ReadProbabilityAssessmentInput(this MacroStabilityOutwardsFailureMechanismMetaEntity entity, MacroStabilityOutwardsProbabilityAssessmentInput probabilityAssessmentInput) { if (entity == null) Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingFailureMechanismMetaEntityReadExtensions.cs =================================================================== diff -u -r6277a949d4da1a8861151b8b62d61dc6381b1eed -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingFailureMechanismMetaEntityReadExtensions.cs (.../PipingFailureMechanismMetaEntityReadExtensions.cs) (revision 6277a949d4da1a8861151b8b62d61dc6381b1eed) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingFailureMechanismMetaEntityReadExtensions.cs (.../PipingFailureMechanismMetaEntityReadExtensions.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -40,13 +40,14 @@ /// The to set the /// for. /// Thrown when any input parameter is null. - public static void ReadProbabilityAssessmentInput(this PipingFailureMechanismMetaEntity entity, - PipingProbabilityAssessmentInput probabilityAssessmentInput) + internal static void ReadProbabilityAssessmentInput(this PipingFailureMechanismMetaEntity entity, + PipingProbabilityAssessmentInput probabilityAssessmentInput) { if (entity == null) { throw new ArgumentNullException(nameof(entity)); } + if (probabilityAssessmentInput == null) { throw new ArgumentNullException(nameof(probabilityAssessmentInput)); @@ -64,13 +65,14 @@ /// The to set the /// for. /// Thrown when any input parameter is null. - public static void ReadGeneralPipingInput(this PipingFailureMechanismMetaEntity entity, - GeneralPipingInput generalPipingInput) + internal static void ReadGeneralPipingInput(this PipingFailureMechanismMetaEntity entity, + GeneralPipingInput generalPipingInput) { if (entity == null) { throw new ArgumentNullException(nameof(entity)); } + if (generalPipingInput == null) { throw new ArgumentNullException(nameof(generalPipingInput)); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructureFailureMechanismMetaEntityReadExtensions.cs =================================================================== diff -u -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0 -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructureFailureMechanismMetaEntityReadExtensions.cs (.../StabilityPointStructureFailureMechanismMetaEntityReadExtensions.cs) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructureFailureMechanismMetaEntityReadExtensions.cs (.../StabilityPointStructureFailureMechanismMetaEntityReadExtensions.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using Application.Ringtoets.Storage.DbContext; using Core.Common.Base.Data; using Ringtoets.StabilityPointStructures.Data; @@ -38,8 +39,14 @@ /// The /// to create for. /// A new . + /// Thrown when is null. internal static GeneralStabilityPointStructuresInput Read(this StabilityPointStructuresFailureMechanismMetaEntity entity) { + if (entity == null) + { + throw new ArgumentNullException(nameof(entity)); + } + return new GeneralStabilityPointStructuresInput { N = (RoundedDouble) entity.N Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverFailureMechanismMetaEntityReadExtensions.cs =================================================================== diff -u -r7d89262d3b971dceec1e987e22d0027bf675c196 -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverFailureMechanismMetaEntityReadExtensions.cs (.../StabilityStoneCoverFailureMechanismMetaEntityReadExtensions.cs) (revision 7d89262d3b971dceec1e987e22d0027bf675c196) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverFailureMechanismMetaEntityReadExtensions.cs (.../StabilityStoneCoverFailureMechanismMetaEntityReadExtensions.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using Application.Ringtoets.Storage.DbContext; using Core.Common.Base.Data; using Ringtoets.StabilityStoneCover.Data; @@ -38,8 +39,14 @@ /// The /// to create for. /// A new . + /// Thrown when is null. internal static GeneralStabilityStoneCoverWaveConditionsInput Read(this StabilityStoneCoverFailureMechanismMetaEntity entity) { + if (entity == null) + { + throw new ArgumentNullException(nameof(entity)); + } + return new GeneralStabilityStoneCoverWaveConditionsInput { N = (RoundedDouble) entity.N Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StructureCalculationEntityReadExtensions.cs =================================================================== diff -u -r91764687fd1e853385a63f56160f38cb4527c7a8 -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StructureCalculationEntityReadExtensions.cs (.../StructureCalculationEntityReadExtensions.cs) (revision 91764687fd1e853385a63f56160f38cb4527c7a8) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StructureCalculationEntityReadExtensions.cs (.../StructureCalculationEntityReadExtensions.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -44,14 +44,15 @@ /// The object keeping track of read operations. /// Thrown when /// or is null. - public static void Read(this IStructuresCalculationEntity entity, - StructuresInputBase inputToUpdate, - ReadConversionCollector collector) where T : StructureBase + internal static void Read(this IStructuresCalculationEntity entity, + StructuresInputBase inputToUpdate, + ReadConversionCollector collector) where T : StructureBase { if (inputToUpdate == null) { throw new ArgumentNullException(nameof(inputToUpdate)); } + if (collector == null) { throw new ArgumentNullException(nameof(collector)); @@ -61,6 +62,7 @@ { inputToUpdate.ForeshoreProfile = entity.ForeshoreProfileEntity.Read(collector); } + if (entity.HydraulicLocationEntity != null) { inputToUpdate.HydraulicBoundaryLocation = entity.HydraulicLocationEntity.Read(collector); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rfbe227cf3a6743302f63c1bd3281feda0273192c Binary files differ Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject181.rtd =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rfbe227cf3a6743302f63c1bd3281feda0273192c Binary files differ Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -127,13 +127,14 @@ + - + Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensionsTest.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -25,6 +25,7 @@ using Application.Ringtoets.Storage.Create.WaveImpactAsphaltCover; using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.TestUtil; +using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.TestUtil; @@ -69,6 +70,10 @@ NotRelevantComments = { Body = "Really not relevant" + }, + GeneralWaveImpactAsphaltCoverInput = + { + DeltaL = new Random(39).NextRoundedDouble(1.0, 2000.0) } }; var registry = new PersistenceRegistry(); @@ -83,6 +88,8 @@ Assert.AreEqual(failureMechanism.InputComments.Body, entity.InputComments); Assert.AreEqual(failureMechanism.OutputComments.Body, entity.OutputComments); Assert.AreEqual(failureMechanism.NotRelevantComments.Body, entity.NotRelevantComments); + Assert.AreEqual(failureMechanism.GeneralWaveImpactAsphaltCoverInput.DeltaL, + entity.WaveImpactAsphaltCoverFailureMechanismMetaEntities.Single().DeltaL); } [Test] Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -67,6 +67,7 @@ AssertStabilityStoneCoverFailureMechanism(reader); AssertMacroStabilityOutwardsFailureMechanism(reader); AssertPipingStructureFailureMechanism(reader); + AssertWaveImpactAsphaltCoverFailureMechanism(reader); } AssertLogDatabase(logFilePath); @@ -287,26 +288,35 @@ private static void AssertMacroStabilityOutwardsFailureMechanism(MigratedDatabaseReader reader) { - const string validateFailureMechanisms = + const string validateMacroStabilityOutwardsFailureMechanisms = "SELECT COUNT() = (SELECT COUNT() FROM FailureMechanismEntity WHERE FailureMechanismType = 13) " + "FROM [MacroStabilityOutwardsFailureMechanismMetaEntity] " + "WHERE [A] = 0.033 " + "AND [FailureMechanismEntityId] IN " + "(SELECT [FailureMechanismEntityId] FROM [FailureMechanismEntity] WHERE [FailureMechanismType] = 13);"; - reader.AssertReturnedDataIsValid(validateFailureMechanisms); + reader.AssertReturnedDataIsValid(validateMacroStabilityOutwardsFailureMechanisms); } private static void AssertPipingStructureFailureMechanism(MigratedDatabaseReader reader) { - const string validateFailureMechanisms = + const string validatePipingStructureFailureMechanisms = "SELECT COUNT() = (SELECT COUNT() FROM FailureMechanismEntity WHERE FailureMechanismType = 11) " + "FROM [PipingStructureFailureMechanismMetaEntity] " + "WHERE [N] = 1.0 " + "AND [FailureMechanismEntityId] IN " + "(SELECT [FailureMechanismEntityId] FROM [FailureMechanismEntity] WHERE [FailureMechanismType] = 11);"; - reader.AssertReturnedDataIsValid(validateFailureMechanisms); + reader.AssertReturnedDataIsValid(validatePipingStructureFailureMechanisms); } + private static void AssertWaveImpactAsphaltCoverFailureMechanism(MigratedDatabaseReader reader) + { + const string validateWaveImpactAsphaltCoverFailureMechanism = + "SELECT COUNT() = 0 " + + "FROM [WaveImpactAsphaltCoverFailureMechanismMetaEntity] " + + "WHERE [DeltaL] IS NOT 1000;"; + reader.AssertReturnedDataIsValid(validateWaveImpactAsphaltCoverFailureMechanism); + } + #region Migrated Hydraulic Boundary Locations private static void AssertHydraulicBoundaryLocations(MigratedDatabaseReader reader, string sourceFilePath) Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -743,7 +743,7 @@ Assert.AreEqual(notRelevantComments, section.MacroStabilityOutwards.NotRelevantComments.Body); MacroStabilityOutwardsProbabilityAssessmentInput probabilityAssessmentInput = section.MacroStabilityOutwards - .MacroStabilityOutwardsProbabilityAssessmentInput; + .MacroStabilityOutwardsProbabilityAssessmentInput; Assert.AreEqual(parameterA, probabilityAssessmentInput.A); } @@ -758,7 +758,7 @@ const string originalOutput = "Some output text"; const string originalNotRelevantText = "Really not relevant"; - int n = new Random(21).Next(1, 20); + RoundedDouble n = new Random(39).NextRoundedDouble(1.0, 20.0); var failureMechanismEntity = new FailureMechanismEntity { FailureMechanismType = (int) FailureMechanismType.GrassRevetmentTopErosionAndInwards, @@ -879,7 +879,7 @@ const string outputComments = "Some output text"; const string notRelevantComments = "Really not relevant"; - int n = new Random(21).Next(1, 20); + RoundedDouble n = new Random(39).NextRoundedDouble(1.0, 20.0); var failureMechanismEntity = new FailureMechanismEntity { FailureMechanismType = (int) FailureMechanismType.GrassRevetmentErosionOutwards, @@ -1022,6 +1022,7 @@ const string inputComments = "Some input text"; const string outputComments = "Some output text"; const string notRelevantComments = "Really not relevant"; + RoundedDouble n = new Random(39).NextRoundedDouble(1.0, 20.0); var failureMechanismEntity = new FailureMechanismEntity { @@ -1035,7 +1036,7 @@ { new StabilityStoneCoverFailureMechanismMetaEntity { - N = 3.9 + N = n } } }; @@ -1052,6 +1053,7 @@ Assert.AreEqual(inputComments, section.StabilityStoneCover.InputComments.Body); Assert.AreEqual(outputComments, section.StabilityStoneCover.OutputComments.Body); Assert.AreEqual(notRelevantComments, section.StabilityStoneCover.NotRelevantComments.Body); + Assert.AreEqual(n, section.StabilityStoneCover.GeneralInput.N, section.StabilityStoneCover.GeneralInput.N.GetAccuracy()); } [Test] @@ -1167,6 +1169,7 @@ const string inputComments = "Some input text"; const string outputComments = "Some output text"; const string notRelevantComments = "Really not relevant"; + RoundedDouble deltaL = new Random(39).NextRoundedDouble(1.0, 2000.0); var failureMechanismEntity = new FailureMechanismEntity { @@ -1178,7 +1181,10 @@ NotRelevantComments = notRelevantComments, WaveImpactAsphaltCoverFailureMechanismMetaEntities = { - new WaveImpactAsphaltCoverFailureMechanismMetaEntity() + new WaveImpactAsphaltCoverFailureMechanismMetaEntity + { + DeltaL = deltaL + } } }; entity.FailureMechanismEntities.Add(failureMechanismEntity); @@ -1194,6 +1200,9 @@ Assert.AreEqual(inputComments, section.WaveImpactAsphaltCover.InputComments.Body); Assert.AreEqual(outputComments, section.WaveImpactAsphaltCover.OutputComments.Body); Assert.AreEqual(notRelevantComments, section.WaveImpactAsphaltCover.NotRelevantComments.Body); + Assert.AreEqual(deltaL, + section.WaveImpactAsphaltCover.GeneralWaveImpactAsphaltCoverInput.DeltaL, + section.WaveImpactAsphaltCover.GeneralWaveImpactAsphaltCoverInput.DeltaL.GetAccuracy()); } [Test] @@ -1229,7 +1238,8 @@ { new WaveImpactAsphaltCoverFailureMechanismMetaEntity { - ForeshoreProfileCollectionSourcePath = fileLocation + ForeshoreProfileCollectionSourcePath = fileLocation, + DeltaL = new Random(39).NextRoundedDouble(1.0, 2000.0) } } }; @@ -1276,7 +1286,10 @@ }, WaveImpactAsphaltCoverFailureMechanismMetaEntities = { - new WaveImpactAsphaltCoverFailureMechanismMetaEntity() + new WaveImpactAsphaltCoverFailureMechanismMetaEntity + { + DeltaL = new Random(39).NextRoundedDouble(1.0, 2000.0) + } } }; entity.FailureMechanismEntities.Add(failureMechanismEntity); @@ -1302,6 +1315,7 @@ const string inputComments = "Some input text"; const string outputComments = "Some output text"; const string notRelevantComments = "Really not relevant"; + RoundedDouble n = new Random(39).NextRoundedDouble(1.0, 20.0); var failureMechanismEntity = new FailureMechanismEntity { @@ -1315,7 +1329,7 @@ { new HeightStructuresFailureMechanismMetaEntity { - N = 5 + N = n } } }; @@ -1332,6 +1346,9 @@ Assert.AreEqual(inputComments, section.HeightStructures.InputComments.Body); Assert.AreEqual(outputComments, section.HeightStructures.OutputComments.Body); Assert.AreEqual(notRelevantComments, section.HeightStructures.NotRelevantComments.Body); + Assert.AreEqual(n, + section.HeightStructures.GeneralInput.N, + section.HeightStructures.GeneralInput.N.GetAccuracy()); } [Test] @@ -1344,6 +1361,7 @@ const string inputComments = "Some input text"; const string outputComments = "Some output text"; const string notRelevantComments = "Really not relevant"; + int n2a = new Random(39).Next(1, 40); var failureMechanismEntity = new FailureMechanismEntity { @@ -1357,7 +1375,7 @@ { new ClosingStructuresFailureMechanismMetaEntity { - N2A = 3 + N2A = n2a } } }; @@ -1374,6 +1392,7 @@ Assert.AreEqual(inputComments, section.ClosingStructures.InputComments.Body); Assert.AreEqual(outputComments, section.ClosingStructures.OutputComments.Body); Assert.AreEqual(notRelevantComments, section.ClosingStructures.NotRelevantComments.Body); + Assert.AreEqual(n2a, section.ClosingStructures.GeneralInput.N2A); } [Test] @@ -1386,6 +1405,7 @@ const string inputComments = "Some input text"; const string outputComments = "Some output text"; const string notRelevantComments = "Really not relevant"; + RoundedDouble n = new Random(39).NextRoundedDouble(1.0, 20.0); var failureMechanismEntity = new FailureMechanismEntity { @@ -1399,7 +1419,7 @@ { new StabilityPointStructuresFailureMechanismMetaEntity { - N = 5 + N = n } } }; @@ -1416,6 +1436,9 @@ Assert.AreEqual(inputComments, section.StabilityPointStructures.InputComments.Body); Assert.AreEqual(outputComments, section.StabilityPointStructures.OutputComments.Body); Assert.AreEqual(notRelevantComments, section.StabilityPointStructures.NotRelevantComments.Body); + Assert.AreEqual(n, + section.StabilityPointStructures.GeneralInput.N, + section.StabilityPointStructures.GeneralInput.N.GetAccuracy()); } [Test] @@ -1426,7 +1449,9 @@ const string inputComments = "Some input text"; const string outputComments = "Some output text"; const string notRelevantComments = "Really not relevant"; - bool isRelevant = new Random().NextBoolean(); + var random = new Random(39); + bool isRelevant = random.NextBoolean(); + RoundedDouble n = random.NextRoundedDouble(1.0, 20.0); var failureMechanismEntity = new FailureMechanismEntity { @@ -1440,7 +1465,7 @@ { new DuneErosionFailureMechanismMetaEntity { - N = 3 + N = n } } }; @@ -1457,6 +1482,9 @@ Assert.AreEqual(inputComments, section.DuneErosion.InputComments.Body); Assert.AreEqual(outputComments, section.DuneErosion.OutputComments.Body); Assert.AreEqual(notRelevantComments, section.DuneErosion.NotRelevantComments.Body); + Assert.AreEqual(n, + section.DuneErosion.GeneralInput.N, + section.DuneErosion.GeneralInput.N.GetAccuracy()); } [Test] Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresFailureMechanismMetaEntityReadExtensionsTest.cs =================================================================== diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresFailureMechanismMetaEntityReadExtensionsTest.cs (.../ClosingStructuresFailureMechanismMetaEntityReadExtensionsTest.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresFailureMechanismMetaEntityReadExtensionsTest.cs (.../ClosingStructuresFailureMechanismMetaEntityReadExtensionsTest.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.Read.ClosingStructures; using NUnit.Framework; @@ -30,12 +31,23 @@ public class ClosingStructuresFailureMechanismMetaEntityReadExtensionsTest { [Test] + public void ReadClosingStructuresFailureMechanism_EntityNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => ((ClosingStructuresFailureMechanismMetaEntity) null).Read(); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("entity", exception.ParamName); + } + + [Test] public void Read_Always_ReturnGeneralClosingStructuresInput() { // Setup var entity = new ClosingStructuresFailureMechanismMetaEntity { - N2A = 3 + N2A = new Random(39).Next(1, 40) }; // Call Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosion/DuneErosionFailureMechanismMetaEntityReadExtensionsTest.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosion/DuneErosionFailureMechanismMetaEntityReadExtensionsTest.cs (.../DuneErosionFailureMechanismMetaEntityReadExtensionsTest.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosion/DuneErosionFailureMechanismMetaEntityReadExtensionsTest.cs (.../DuneErosionFailureMechanismMetaEntityReadExtensionsTest.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -33,6 +33,20 @@ public class DuneErosionFailureMechanismMetaEntityReadExtensionsTest { [Test] + public void ReadDuneErosionFailureMechanism_EntityNull_ThrowsArgumentNullException() + { + // Setup + var generalInput = new GeneralDuneErosionInput(); + + // Call + TestDelegate test = () => ((DuneErosionFailureMechanismMetaEntity) null).Read(generalInput); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("entity", exception.ParamName); + } + + [Test] public void Read_InputNull_ThrowsArgumentNullException() { // Setup Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs =================================================================== diff -u -r899d227631395ebeb5154719f7b92a42ddbc6f96 -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 899d227631395ebeb5154719f7b92a42ddbc6f96) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -1069,7 +1069,6 @@ public void ReadAsGrassCoverErosionInwardsFailureMechanism_WithCollector_ReturnsNewGrassCoverErosionInwardsFailureMechanismWithPropertiesSet(bool isRelevant) { // Setup - int n = new Random(21).Next(1, 20); var entity = new FailureMechanismEntity { IsRelevant = Convert.ToByte(isRelevant), @@ -1080,7 +1079,7 @@ { new GrassCoverErosionInwardsFailureMechanismMetaEntity { - N = n + N = new Random(39).NextRoundedDouble(1.0, 20.0) } }, CalculationGroupEntity = new CalculationGroupEntity() @@ -1101,6 +1100,7 @@ RoundedDouble actualN = failureMechanism.GeneralInput.N; Assert.AreEqual(entity.GrassCoverErosionInwardsFailureMechanismMetaEntities.Single().N, actualN, actualN.GetAccuracy()); + Assert.IsNull(failureMechanism.DikeProfiles.SourcePath); } @@ -1242,7 +1242,6 @@ public void ReadAsGrassCoverErosionOutwardsFailureMechanism_WithCollector_ReturnsNewGrassCoverErosionOutwardsFailureMechanismWithPropertiesSet(bool isRelevant) { // Setup - int n = new Random(21).Next(1, 20); var entity = new FailureMechanismEntity { IsRelevant = Convert.ToByte(isRelevant), @@ -1253,7 +1252,7 @@ { new GrassCoverErosionOutwardsFailureMechanismMetaEntity { - N = n + N = new Random(39).NextRoundedDouble(1.0, 20.0) } }, CalculationGroupEntity = new CalculationGroupEntity() @@ -1506,7 +1505,7 @@ { new StabilityStoneCoverFailureMechanismMetaEntity { - N = 12.34 + N = new Random(39).NextRoundedDouble(1.0, 20.0) } } }; @@ -1524,6 +1523,9 @@ Assert.AreEqual(entity.NotRelevantComments, failureMechanism.NotRelevantComments.Body); CollectionAssert.IsEmpty(failureMechanism.Sections); + RoundedDouble actualN = failureMechanism.GeneralInput.N; + Assert.AreEqual(entity.StabilityStoneCoverFailureMechanismMetaEntities.Single().N, actualN, actualN.GetAccuracy()); + Assert.IsNull(failureMechanism.ForeshoreProfiles.SourcePath); } @@ -1674,7 +1676,10 @@ CalculationGroupEntity = new CalculationGroupEntity(), WaveImpactAsphaltCoverFailureMechanismMetaEntities = { - new WaveImpactAsphaltCoverFailureMechanismMetaEntity() + new WaveImpactAsphaltCoverFailureMechanismMetaEntity + { + DeltaL = new Random(39).NextRoundedDouble(1.0, 2000.0) + } } }; var collector = new ReadConversionCollector(); @@ -1691,6 +1696,9 @@ Assert.AreEqual(entity.NotRelevantComments, failureMechanism.NotRelevantComments.Body); CollectionAssert.IsEmpty(failureMechanism.Sections); + RoundedDouble actualDeltaL = failureMechanism.GeneralWaveImpactAsphaltCoverInput.DeltaL; + Assert.AreEqual(entity.WaveImpactAsphaltCoverFailureMechanismMetaEntities.Single().DeltaL, actualDeltaL, actualDeltaL.GetAccuracy()); + Assert.IsNull(failureMechanism.ForeshoreProfiles.SourcePath); } @@ -1720,7 +1728,10 @@ }, WaveImpactAsphaltCoverFailureMechanismMetaEntities = { - new WaveImpactAsphaltCoverFailureMechanismMetaEntity() + new WaveImpactAsphaltCoverFailureMechanismMetaEntity + { + DeltaL = new Random(39).NextRoundedDouble(1.0, 2000.0) + } } }; var collector = new ReadConversionCollector(); @@ -1752,7 +1763,8 @@ { new WaveImpactAsphaltCoverFailureMechanismMetaEntity { - ForeshoreProfileCollectionSourcePath = fileLocation + ForeshoreProfileCollectionSourcePath = fileLocation, + DeltaL = new Random(39).NextRoundedDouble(1.0, 2000.0) } } }; @@ -1796,7 +1808,8 @@ { new WaveImpactAsphaltCoverFailureMechanismMetaEntity { - ForeshoreProfileCollectionSourcePath = fileLocation + ForeshoreProfileCollectionSourcePath = fileLocation, + DeltaL = new Random(39).NextRoundedDouble(1.0, 2000.0) } } }; @@ -1839,7 +1852,7 @@ { new HeightStructuresFailureMechanismMetaEntity { - N = 1 + N = new Random(39).NextRoundedDouble(1.0, 20.0) } } }; @@ -1857,6 +1870,9 @@ Assert.AreEqual(entity.NotRelevantComments, failureMechanism.NotRelevantComments.Body); CollectionAssert.IsEmpty(failureMechanism.Sections); + RoundedDouble actualN = failureMechanism.GeneralInput.N; + Assert.AreEqual(entity.HeightStructuresFailureMechanismMetaEntities.Single().N, actualN, actualN.GetAccuracy()); + Assert.IsNull(failureMechanism.ForeshoreProfiles.SourcePath); } @@ -2323,7 +2339,7 @@ { new StabilityPointStructuresFailureMechanismMetaEntity { - N = 1 + N = new Random(39).NextRoundedDouble(1.0, 20.0) } } }; @@ -2341,6 +2357,8 @@ Assert.AreEqual(entity.NotRelevantComments, failureMechanism.NotRelevantComments.Body); CollectionAssert.IsEmpty(failureMechanism.Sections); + RoundedDouble actualN = failureMechanism.GeneralInput.N; + Assert.AreEqual(entity.StabilityPointStructuresFailureMechanismMetaEntities.Single().N, actualN, actualN.GetAccuracy()); Assert.IsNull(failureMechanism.ForeshoreProfiles.SourcePath); } @@ -2628,7 +2646,7 @@ { new PipingStructureFailureMechanismMetaEntity { - N = random.NextDouble() + 1.0 + N = random.NextRoundedDouble(1.0, 20.0) } } }; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs =================================================================== diff -u -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8 -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -34,6 +34,20 @@ public class GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest { [Test] + public void ReadGrassCoverErosionInwardsFailureMechanism_EntityNull_ThrowsArgumentNullException() + { + // Setup + var generalInput = new GeneralGrassCoverErosionInwardsInput(); + + // Call + TestDelegate test = () => ((GrassCoverErosionInwardsFailureMechanismMetaEntity) null).Read(generalInput); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("entity", exception.ParamName); + } + + [Test] public void Read_GeneralInputIsNull_ThrowArgumentNullException() { // Setup Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismMetaEntityReadExtensionsTest.cs =================================================================== diff -u -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8 -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismMetaEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismMetaEntityReadExtensionsTest.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismMetaEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismMetaEntityReadExtensionsTest.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -34,6 +34,20 @@ public class GrassCoverErosionOutwardsFailureMechanismMetaEntityReadExtensionsTest { [Test] + public void ReadGrassCoverErosionOutwardsFailureMechanism_EntityNull_ThrowsArgumentNullException() + { + // Setup + var input = new GeneralGrassCoverErosionOutwardsInput(); + + // Call + TestDelegate test = () => ((GrassCoverErosionOutwardsFailureMechanismMetaEntity) null).Read(input); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("entity", exception.ParamName); + } + + [Test] public void Read_GeneralInputIsNull_ThrowArgumentNullException() { // Setup Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresFailureMechanismMetaEntityReadExtensionsTest.cs =================================================================== diff -u -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8 -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresFailureMechanismMetaEntityReadExtensionsTest.cs (.../HeightStructuresFailureMechanismMetaEntityReadExtensionsTest.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresFailureMechanismMetaEntityReadExtensionsTest.cs (.../HeightStructuresFailureMechanismMetaEntityReadExtensionsTest.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -19,8 +19,10 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.Read.HeightStructures; +using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.TestUtil; using Ringtoets.HeightStructures.Data; @@ -31,12 +33,23 @@ public class HeightStructuresFailureMechanismMetaEntityReadExtensionsTest { [Test] + public void ReadHeightStructuresFailureMechanism_EntityNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => ((HeightStructuresFailureMechanismMetaEntity) null).Read(); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("entity", exception.ParamName); + } + + [Test] public void Read_Always_ReturnGeneralHeightStructuresInput() { // Setup var entity = new HeightStructuresFailureMechanismMetaEntity { - N = 3 + N = new Random(39).NextRoundedDouble(1.0, 20.0) }; // Call Fisheye: Tag fbe227cf3a6743302f63c1bd3281feda0273192c refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructureFailureMechanismMetaEntityReadExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCover/StabilityStoneCoverFailureMechanismMetaEntityReadExtensionsTest.cs =================================================================== diff -u -r7d89262d3b971dceec1e987e22d0027bf675c196 -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCover/StabilityStoneCoverFailureMechanismMetaEntityReadExtensionsTest.cs (.../StabilityStoneCoverFailureMechanismMetaEntityReadExtensionsTest.cs) (revision 7d89262d3b971dceec1e987e22d0027bf675c196) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCover/StabilityStoneCoverFailureMechanismMetaEntityReadExtensionsTest.cs (.../StabilityStoneCoverFailureMechanismMetaEntityReadExtensionsTest.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -19,8 +19,10 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.Read.StabilityStoneCover; +using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.TestUtil; using Ringtoets.StabilityStoneCover.Data; @@ -31,12 +33,23 @@ public class StabilityStoneCoverFailureMechanismMetaEntityReadExtensionsTest { [Test] + public void ReadStabilityStoneCoverFailureMechanism_EntityNull_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => ((StabilityStoneCoverFailureMechanismMetaEntity) null).Read(); + + // Assert + var exception = Assert.Throws(test); + Assert.AreEqual("entity", exception.ParamName); + } + + [Test] public void Read_Always_ReturnGeneralStabilityStoneCoverWaveConditionsInput() { // Setup var entity = new StabilityStoneCoverFailureMechanismMetaEntity { - N = 3.1415 + N = new Random(39).NextRoundedDouble(1.0, 20.0) }; // Call Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -98,6 +98,8 @@ AssertStabilityPointStructuresFailureMechanism(assessmentSection); + AssertPipingStructureFailureMechanism(assessmentSection); + AssertDuneErosionFailureMechanism(assessmentSection); } @@ -463,7 +465,7 @@ Assert.AreSame(calculationWithOutput, sectionResult.Calculation); } - private static void AsserPipingStructureFailureMechanism(AssessmentSection assessmentSection) + private static void AssertPipingStructureFailureMechanism(AssessmentSection assessmentSection) { PipingStructureFailureMechanism failureMechanism = assessmentSection.PipingStructure; Assert.AreEqual(12.5, failureMechanism.N, failureMechanism.N.GetAccuracy()); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -rd491788b870f9a9d2e08c93b52777f613809a133 -rfbe227cf3a6743302f63c1bd3281feda0273192c --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs (.../ClosingStructuresFailureMechanismResultViewTest.cs) (revision d491788b870f9a9d2e08c93b52777f613809a133) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs (.../ClosingStructuresFailureMechanismResultViewTest.cs) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -222,7 +222,7 @@ } [Test] - public void GivenFormWithFailureMechanismResultView_WhenDataSourceWithClosingStructureFailureMechanismSectionResultAssigned_ThenSectionsAddedAsRows() + public void GivenFormWithFailureMechanismResultView_WhenDataSourceWithClosingStructuresFailureMechanismSectionResultAssigned_ThenSectionsAddedAsRows() { // Given var section1 = new FailureMechanismSection("Section 1", new[] Index: build/DatabaseStructure.sql =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rfbe227cf3a6743302f63c1bd3281feda0273192c --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 3dbf451144dc23d8abe649913baee1a5e544c48c) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision fbe227cf3a6743302f63c1bd3281feda0273192c) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 30-Jan-2018 14:00:08 */ +/* Created On : 30-jan-2018 14:54:26 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -922,6 +922,7 @@ 'WaveImpactAsphaltCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismEntityId' INTEGER NOT NULL, 'ForeshoreProfileCollectionSourcePath' TEXT, + 'DeltaL' REAL NOT NULL, CONSTRAINT 'FK_WaveImpactAsphaltCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; Index: design/DatabaseDesign.eap =================================================================== diff -u -r3dbf451144dc23d8abe649913baee1a5e544c48c -rfbe227cf3a6743302f63c1bd3281feda0273192c Binary files differ