Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructureFailureMechanismCreateExtensions.cs
===================================================================
diff -u -r1cd3618f5f8916ef15992d69ec3b447b311c2f72 -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructureFailureMechanismCreateExtensions.cs (.../ClosingStructureFailureMechanismCreateExtensions.cs) (revision 1cd3618f5f8916ef15992d69ec3b447b311c2f72)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructureFailureMechanismCreateExtensions.cs (.../ClosingStructureFailureMechanismCreateExtensions.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -20,8 +20,10 @@
// All rights reserved.
using System;
+using System.Collections.Generic;
using Application.Ringtoets.Storage.DbContext;
using Ringtoets.Integration.Data.StandAlone;
+using Ringtoets.Integration.Data.StandAlone.SectionResults;
namespace Application.Ringtoets.Storage.Create
{
@@ -39,28 +41,18 @@
/// Thrown when is null.
internal static FailureMechanismEntity Create(this ClosingStructureFailureMechanism mechanism, PersistenceRegistry registry)
{
- if (registry == null)
- {
- throw new ArgumentNullException("registry");
- }
+ var entity = mechanism.Create(FailureMechanismType.ReliabilityClosingOfStructure, registry);
+ AddEntitiesForSectionResults(mechanism.SectionResults, registry);
- var entity = new FailureMechanismEntity
- {
- FailureMechanismType = (short) FailureMechanismType.ReliabilityClosingOfStructure,
- IsRelevant = Convert.ToByte(mechanism.IsRelevant),
- Comments = mechanism.Comments
- };
-
- mechanism.AddEntitiesForFailureMechanismSections(registry, entity);
- AddEntitiesForSectionResults(mechanism, registry);
-
registry.Register(entity, mechanism);
return entity;
}
- private static void AddEntitiesForSectionResults(ClosingStructureFailureMechanism mechanism, PersistenceRegistry registry)
+ private static void AddEntitiesForSectionResults(
+ IEnumerable sectionResults,
+ PersistenceRegistry registry)
{
- foreach (var failureMechanismSectionResult in mechanism.SectionResults)
+ foreach (var failureMechanismSectionResult in sectionResults)
{
var sectionResultEntity = failureMechanismSectionResult.Create(registry);
var section = registry.Get(failureMechanismSectionResult.Section);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs
===================================================================
diff -u -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -20,6 +20,7 @@
// All rights reserved.
using System;
+using System.Collections.Generic;
using Application.Ringtoets.Storage.DbContext;
using Ringtoets.GrassCoverErosionInwards.Data;
@@ -39,28 +40,18 @@
/// Thrown when is null.
internal static FailureMechanismEntity Create(this GrassCoverErosionInwardsFailureMechanism mechanism, PersistenceRegistry registry)
{
- if (registry == null)
- {
- throw new ArgumentNullException("registry");
- }
+ var entity = mechanism.Create(FailureMechanismType.GrassRevetmentTopErosionAndInwards, registry);
+ AddEntitiesForSectionResults(mechanism.SectionResults, registry);
- var entity = new FailureMechanismEntity
- {
- FailureMechanismType = (short) FailureMechanismType.GrassRevetmentTopErosionAndInwards,
- IsRelevant = Convert.ToByte(mechanism.IsRelevant),
- Comments = mechanism.Comments
- };
-
- mechanism.AddEntitiesForFailureMechanismSections(registry, entity);
- AddEntitiesForSectionResults(mechanism, registry);
-
registry.Register(entity, mechanism);
return entity;
}
- private static void AddEntitiesForSectionResults(GrassCoverErosionInwardsFailureMechanism mechanism, PersistenceRegistry registry)
+ private static void AddEntitiesForSectionResults(
+ IEnumerable sectionResults,
+ PersistenceRegistry registry)
{
- foreach (var failureMechanismSectionResult in mechanism.SectionResults)
+ foreach (var failureMechanismSectionResult in sectionResults)
{
var sectionResultEntity = failureMechanismSectionResult.Create(registry);
var section = registry.Get(failureMechanismSectionResult.Section);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructuresFailureMechanismCreateExtensions.cs
===================================================================
diff -u -r0868d78756c7992a83a096f3d3759046c2dbb217 -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructuresFailureMechanismCreateExtensions.cs (.../HeightStructuresFailureMechanismCreateExtensions.cs) (revision 0868d78756c7992a83a096f3d3759046c2dbb217)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructuresFailureMechanismCreateExtensions.cs (.../HeightStructuresFailureMechanismCreateExtensions.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -20,6 +20,7 @@
// All rights reserved.
using System;
+using System.Collections.Generic;
using Application.Ringtoets.Storage.DbContext;
using Ringtoets.HeightStructures.Data;
@@ -39,28 +40,18 @@
/// Thrown when is null.
internal static FailureMechanismEntity Create(this HeightStructuresFailureMechanism mechanism, PersistenceRegistry registry)
{
- if (registry == null)
- {
- throw new ArgumentNullException("registry");
- }
+ var entity = mechanism.Create(FailureMechanismType.StructureHeight, registry);
+ AddEntitiesForSectionResults(mechanism.SectionResults, registry);
- var entity = new FailureMechanismEntity
- {
- FailureMechanismType = (short) FailureMechanismType.StructureHeight,
- IsRelevant = Convert.ToByte(mechanism.IsRelevant),
- Comments = mechanism.Comments
- };
-
- mechanism.AddEntitiesForFailureMechanismSections(registry, entity);
- AddEntitiesForSectionResults(mechanism, registry);
-
registry.Register(entity, mechanism);
return entity;
}
- private static void AddEntitiesForSectionResults(HeightStructuresFailureMechanism mechanism, PersistenceRegistry registry)
+ private static void AddEntitiesForSectionResults(
+ IEnumerable sectionResults,
+ PersistenceRegistry registry)
{
- foreach (var failureMechanismSectionResult in mechanism.SectionResults)
+ foreach (var failureMechanismSectionResult in sectionResults)
{
var sectionResultEntity = failureMechanismSectionResult.Create(registry);
var section = registry.Get(failureMechanismSectionResult.Section);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingFailureMechanismCreateExtensions.cs
===================================================================
diff -u -rbb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingFailureMechanismCreateExtensions.cs (.../PipingFailureMechanismCreateExtensions.cs) (revision bb92ba4d7297c7bf0d1c81ff3d9d6bcab640d55f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingFailureMechanismCreateExtensions.cs (.../PipingFailureMechanismCreateExtensions.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -20,6 +20,7 @@
// All rights reserved.
using System;
+using System.Collections.Generic;
using Application.Ringtoets.Storage.DbContext;
using Ringtoets.Piping.Data;
using Ringtoets.Piping.Primitives;
@@ -40,33 +41,24 @@
/// Thrown when is null.
internal static FailureMechanismEntity Create(this PipingFailureMechanism mechanism, PersistenceRegistry registry)
{
- if (registry == null)
- {
- throw new ArgumentNullException("registry");
- }
+ var entity = mechanism.Create(FailureMechanismType.Piping, registry);
- var entity = new FailureMechanismEntity
- {
- FailureMechanismType = (short) FailureMechanismType.Piping,
- IsRelevant = Convert.ToByte(mechanism.IsRelevant),
- Comments = mechanism.Comments
- };
-
AddEntitiesForFailureMechanismMeta(mechanism, registry, entity);
AddEntitiesForStochasticSoilModels(mechanism, registry, entity);
AddEntitiesForSurfaceLines(mechanism, registry, entity);
- mechanism.AddEntitiesForFailureMechanismSections(registry, entity);
- AddEntitiesForSectionResults(mechanism, registry);
+ AddEntitiesForSectionResults(mechanism.SectionResults, registry);
entity.CalculationGroupEntity = mechanism.CalculationsGroup.Create(registry, 0);
registry.Register(entity, mechanism);
return entity;
}
- private static void AddEntitiesForSectionResults(PipingFailureMechanism mechanism, PersistenceRegistry registry)
+ private static void AddEntitiesForSectionResults(
+ IEnumerable sectionResults,
+ PersistenceRegistry registry)
{
- foreach (var pipingFailureMechanismSectionResult in mechanism.SectionResults)
+ foreach (var pipingFailureMechanismSectionResult in sectionResults)
{
var pipingSectionResultEntity = pipingFailureMechanismSectionResult.Create(registry);
var section = registry.Get(pipingFailureMechanismSectionResult.Section);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs
===================================================================
diff -u -rebad637e9483d348a5efe2fe902d56aa91bf6a31 -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs) (revision ebad637e9483d348a5efe2fe902d56aa91bf6a31)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -20,8 +20,10 @@
// All rights reserved.
using System;
+using System.Collections.Generic;
using Application.Ringtoets.Storage.DbContext;
using Ringtoets.Integration.Data.StandAlone;
+using Ringtoets.Integration.Data.StandAlone.SectionResults;
namespace Application.Ringtoets.Storage.Create
{
@@ -39,28 +41,18 @@
/// Thrown when is null.
internal static FailureMechanismEntity Create(this StrengthStabilityLengthwiseConstructionFailureMechanism mechanism, PersistenceRegistry registry)
{
- if (registry == null)
- {
- throw new ArgumentNullException("registry");
- }
+ var entity = mechanism.Create(FailureMechanismType.StrengthAndStabilityParallelConstruction, registry);
+ AddEntitiesForSectionResults(mechanism.SectionResults, registry);
- var entity = new FailureMechanismEntity
- {
- FailureMechanismType = (short) FailureMechanismType.StrengthAndStabilityParallelConstruction,
- IsRelevant = Convert.ToByte(mechanism.IsRelevant),
- Comments = mechanism.Comments
- };
-
- mechanism.AddEntitiesForFailureMechanismSections(registry, entity);
- AddEntitiesForSectionResults(mechanism, registry);
-
registry.Register(entity, mechanism);
return entity;
}
- private static void AddEntitiesForSectionResults(StrengthStabilityLengthwiseConstructionFailureMechanism mechanism, PersistenceRegistry registry)
+ private static void AddEntitiesForSectionResults(
+ IEnumerable sectionResults,
+ PersistenceRegistry registry)
{
- foreach (var failureMechanismSectionResult in mechanism.SectionResults)
+ foreach (var failureMechanismSectionResult in sectionResults)
{
var sectionResultEntity = failureMechanismSectionResult.Create(registry);
var section = registry.Get(failureMechanismSectionResult.Section);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/TechnicalInnovationFailureMechanismCreateExtensions.cs
===================================================================
diff -u -r2fe46c62134fde70ada240fa952971444177be90 -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/TechnicalInnovationFailureMechanismCreateExtensions.cs (.../TechnicalInnovationFailureMechanismCreateExtensions.cs) (revision 2fe46c62134fde70ada240fa952971444177be90)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/TechnicalInnovationFailureMechanismCreateExtensions.cs (.../TechnicalInnovationFailureMechanismCreateExtensions.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -20,8 +20,10 @@
// All rights reserved.
using System;
+using System.Collections.Generic;
using Application.Ringtoets.Storage.DbContext;
using Ringtoets.Integration.Data.StandAlone;
+using Ringtoets.Integration.Data.StandAlone.SectionResults;
namespace Application.Ringtoets.Storage.Create
{
@@ -39,28 +41,18 @@
/// Thrown when is null.
internal static FailureMechanismEntity Create(this TechnicalInnovationFailureMechanism mechanism, PersistenceRegistry registry)
{
- if (registry == null)
- {
- throw new ArgumentNullException("registry");
- }
+ var entity = mechanism.Create(FailureMechanismType.TechnicalInnovations, registry);
+ AddEntitiesForSectionResults(mechanism.SectionResults, registry);
- var entity = new FailureMechanismEntity
- {
- FailureMechanismType = (short) FailureMechanismType.TechnicalInnovations,
- IsRelevant = Convert.ToByte(mechanism.IsRelevant),
- Comments = mechanism.Comments
- };
-
- mechanism.AddEntitiesForFailureMechanismSections(registry, entity);
- AddEntitiesForSectionResults(mechanism, registry);
-
registry.Register(entity, mechanism);
return entity;
}
- private static void AddEntitiesForSectionResults(TechnicalInnovationFailureMechanism mechanism, PersistenceRegistry registry)
+ private static void AddEntitiesForSectionResults(
+ IEnumerable sectionResults,
+ PersistenceRegistry registry)
{
- foreach (var failureMechanismSectionResult in mechanism.SectionResults)
+ foreach (var failureMechanismSectionResult in sectionResults)
{
var sectionResultEntity = failureMechanismSectionResult.Create(registry);
var section = registry.Get(failureMechanismSectionResult.Section);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCoverFailureMechanismCreateExtensions.cs
===================================================================
diff -u -r2fe46c62134fde70ada240fa952971444177be90 -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCoverFailureMechanismCreateExtensions.cs (.../WaterPressureAsphaltCoverFailureMechanismCreateExtensions.cs) (revision 2fe46c62134fde70ada240fa952971444177be90)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCoverFailureMechanismCreateExtensions.cs (.../WaterPressureAsphaltCoverFailureMechanismCreateExtensions.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -20,8 +20,10 @@
// All rights reserved.
using System;
+using System.Collections.Generic;
using Application.Ringtoets.Storage.DbContext;
using Ringtoets.Integration.Data.StandAlone;
+using Ringtoets.Integration.Data.StandAlone.SectionResults;
namespace Application.Ringtoets.Storage.Create
{
@@ -39,28 +41,18 @@
/// Thrown when is null.
internal static FailureMechanismEntity Create(this WaterPressureAsphaltCoverFailureMechanism mechanism, PersistenceRegistry registry)
{
- if (registry == null)
- {
- throw new ArgumentNullException("registry");
- }
+ var entity = mechanism.Create(FailureMechanismType.WaterOverpressureAsphaltRevetment, registry);
+ AddEntitiesForSectionResults(mechanism.SectionResults, registry);
- var entity = new FailureMechanismEntity
- {
- FailureMechanismType = (short) FailureMechanismType.WaterOverpressureAsphaltRevetment,
- IsRelevant = Convert.ToByte(mechanism.IsRelevant),
- Comments = mechanism.Comments
- };
-
- mechanism.AddEntitiesForFailureMechanismSections(registry, entity);
- AddEntitiesForSectionResults(mechanism, registry);
-
registry.Register(entity, mechanism);
return entity;
}
- private static void AddEntitiesForSectionResults(WaterPressureAsphaltCoverFailureMechanism mechanism, PersistenceRegistry registry)
+ private static void AddEntitiesForSectionResults(
+ IEnumerable sectionResults,
+ PersistenceRegistry registry)
{
- foreach (var failureMechanismSectionResult in mechanism.SectionResults)
+ foreach (var failureMechanismSectionResult in sectionResults)
{
var sectionResultEntity = failureMechanismSectionResult.Create(registry);
var section = registry.Get(failureMechanismSectionResult.Section);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructureSectionResultEntityReadExtensions.cs
===================================================================
diff -u -r1cd3618f5f8916ef15992d69ec3b447b311c2f72 -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructureSectionResultEntityReadExtensions.cs (.../ClosingStructureSectionResultEntityReadExtensions.cs) (revision 1cd3618f5f8916ef15992d69ec3b447b311c2f72)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructureSectionResultEntityReadExtensions.cs (.../ClosingStructureSectionResultEntityReadExtensions.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -33,27 +33,29 @@
internal static class ClosingStructureSectionResultEntityReadExtensions
{
///
- /// Reads the and use the information to construct a
+ /// Reads the and use the information to update a
/// .
///
/// The to create for.
+ /// The target of the read operation.
/// The object keeping track of read operations.
/// A new .
/// Thrown when is null.
- internal static ClosingStructureFailureMechanismSectionResult Read(this ClosingStructureSectionResultEntity entity, ReadConversionCollector collector)
+ internal static void Read(this ClosingStructureSectionResultEntity entity, ClosingStructureFailureMechanismSectionResult sectionResult, ReadConversionCollector collector)
{
if (collector == null)
{
throw new ArgumentNullException("collector");
- }
- var sectionResult = new ClosingStructureFailureMechanismSectionResult(collector.Get(entity.FailureMechanismSectionEntity))
+ }
+ if (sectionResult == null)
{
- StorageId = entity.ClosingStructureSectionResultEntityId,
- AssessmentLayerOne = Convert.ToBoolean(entity.LayerOne),
- AssessmentLayerTwoA = (RoundedDouble)entity.LayerTwoA.ToNanableDouble(),
- AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNanableDouble()
- };
- return sectionResult;
+ throw new ArgumentNullException("sectionResult");
+ }
+
+ sectionResult.StorageId = entity.ClosingStructureSectionResultEntityId;
+ sectionResult.AssessmentLayerOne = Convert.ToBoolean(entity.LayerOne);
+ sectionResult.AssessmentLayerTwoA = (RoundedDouble)entity.LayerTwoA.ToNanableDouble();
+ sectionResult.AssessmentLayerThree = (RoundedDouble)entity.LayerThree.ToNanableDouble();
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -r1cd3618f5f8916ef15992d69ec3b447b311c2f72 -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 1cd3618f5f8916ef15992d69ec3b447b311c2f72)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -61,7 +61,7 @@
}
failureMechanism.StorageId = entity.FailureMechanismEntityId;
- failureMechanism.IsRelevant = entity.IsRelevant == 1;
+ failureMechanism.IsRelevant = Convert.ToBoolean(entity.IsRelevant);
failureMechanism.Comments = entity.Comments;
if (entity.PipingFailureMechanismMetaEntities.Count > 0)
@@ -90,12 +90,10 @@
{
foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.PipingSectionResultEntities))
{
- var readSectionResult = sectionResultEntity.Read(collector);
var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
- result.StorageId = readSectionResult.StorageId;
- result.AssessmentLayerOne = readSectionResult.AssessmentLayerOne;
- result.AssessmentLayerThree = readSectionResult.AssessmentLayerThree;
+
+ sectionResultEntity.Read(result, collector);
}
}
@@ -108,7 +106,7 @@
internal static void ReadAsGrassCoverErosionInwardsFailureMechanism(this FailureMechanismEntity entity, GrassCoverErosionInwardsFailureMechanism failureMechanism, ReadConversionCollector collector)
{
failureMechanism.StorageId = entity.FailureMechanismEntityId;
- failureMechanism.IsRelevant = entity.IsRelevant == 1;
+ failureMechanism.IsRelevant = Convert.ToBoolean(entity.IsRelevant);
failureMechanism.Comments = entity.Comments;
entity.ReadFailureMechanismSections(failureMechanism, collector);
@@ -119,12 +117,10 @@
{
foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverErosionInwardsSectionResultEntities))
{
- var readSectionResult = sectionResultEntity.Read(collector);
var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
- result.StorageId = readSectionResult.StorageId;
- result.AssessmentLayerOne = readSectionResult.AssessmentLayerOne;
- result.AssessmentLayerThree = readSectionResult.AssessmentLayerThree;
+
+ sectionResultEntity.Read(result, collector);
}
}
@@ -137,7 +133,7 @@
internal static void ReadAsHeightStructuresFailureMechanism(this FailureMechanismEntity entity, HeightStructuresFailureMechanism failureMechanism, ReadConversionCollector collector)
{
failureMechanism.StorageId = entity.FailureMechanismEntityId;
- failureMechanism.IsRelevant = entity.IsRelevant == 1;
+ failureMechanism.IsRelevant = Convert.ToBoolean(entity.IsRelevant);
failureMechanism.Comments = entity.Comments;
entity.ReadFailureMechanismSections(failureMechanism, collector);
@@ -148,12 +144,10 @@
{
foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.HeightStructuresSectionResultEntities))
{
- var readSectionResult = sectionResultEntity.Read(collector);
var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
- result.StorageId = readSectionResult.StorageId;
- result.AssessmentLayerOne = readSectionResult.AssessmentLayerOne;
- result.AssessmentLayerThree = readSectionResult.AssessmentLayerThree;
+
+ sectionResultEntity.Read(result, collector);
}
}
@@ -166,7 +160,7 @@
internal static void ReadAsStrengthStabilityLengthwiseConstructionFailureMechanism(this FailureMechanismEntity entity, StrengthStabilityLengthwiseConstructionFailureMechanism failureMechanism, ReadConversionCollector collector)
{
failureMechanism.StorageId = entity.FailureMechanismEntityId;
- failureMechanism.IsRelevant = entity.IsRelevant == 1;
+ failureMechanism.IsRelevant = Convert.ToBoolean(entity.IsRelevant);
failureMechanism.Comments = entity.Comments;
entity.ReadFailureMechanismSections(failureMechanism, collector);
@@ -177,12 +171,10 @@
{
foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.StrengthStabilityLengthwiseConstructionSectionResultEntities))
{
- var readSectionResult = sectionResultEntity.Read(collector);
var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
- result.StorageId = readSectionResult.StorageId;
- result.AssessmentLayerOne = readSectionResult.AssessmentLayerOne;
- result.AssessmentLayerThree = readSectionResult.AssessmentLayerThree;
+
+ sectionResultEntity.Read(result, collector);
}
}
@@ -195,7 +187,7 @@
internal static void ReadAsTechnicalInnovationFailureMechanism(this FailureMechanismEntity entity, TechnicalInnovationFailureMechanism failureMechanism, ReadConversionCollector collector)
{
failureMechanism.StorageId = entity.FailureMechanismEntityId;
- failureMechanism.IsRelevant = entity.IsRelevant == 1;
+ failureMechanism.IsRelevant = Convert.ToBoolean(entity.IsRelevant);
failureMechanism.Comments = entity.Comments;
entity.ReadFailureMechanismSections(failureMechanism, collector);
@@ -206,12 +198,10 @@
{
foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.TechnicalInnovationSectionResultEntities))
{
- var readSectionResult = sectionResultEntity.Read(collector);
var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
- result.StorageId = readSectionResult.StorageId;
- result.AssessmentLayerOne = readSectionResult.AssessmentLayerOne;
- result.AssessmentLayerThree = readSectionResult.AssessmentLayerThree;
+
+ sectionResultEntity.Read(result, collector);
}
}
@@ -224,7 +214,7 @@
internal static void ReadAsWaterPressureAsphaltCoverFailureMechanism(this FailureMechanismEntity entity, WaterPressureAsphaltCoverFailureMechanism failureMechanism, ReadConversionCollector collector)
{
failureMechanism.StorageId = entity.FailureMechanismEntityId;
- failureMechanism.IsRelevant = entity.IsRelevant == 1;
+ failureMechanism.IsRelevant = Convert.ToBoolean(entity.IsRelevant);
failureMechanism.Comments = entity.Comments;
entity.ReadFailureMechanismSections(failureMechanism, collector);
@@ -235,12 +225,10 @@
{
foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.WaterPressureAsphaltCoverSectionResultEntities))
{
- var readSectionResult = sectionResultEntity.Read(collector);
var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
- result.StorageId = readSectionResult.StorageId;
- result.AssessmentLayerOne = readSectionResult.AssessmentLayerOne;
- result.AssessmentLayerThree = readSectionResult.AssessmentLayerThree;
+
+ sectionResultEntity.Read(result, collector);
}
}
@@ -253,7 +241,7 @@
internal static void ReadAsClosingStructureFailureMechanism(this FailureMechanismEntity entity, ClosingStructureFailureMechanism failureMechanism, ReadConversionCollector collector)
{
failureMechanism.StorageId = entity.FailureMechanismEntityId;
- failureMechanism.IsRelevant = entity.IsRelevant == 1;
+ failureMechanism.IsRelevant = Convert.ToBoolean(entity.IsRelevant);
failureMechanism.Comments = entity.Comments;
entity.ReadFailureMechanismSections(failureMechanism, collector);
@@ -264,13 +252,10 @@
{
foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.ClosingStructureSectionResultEntities))
{
- var readSectionResult = sectionResultEntity.Read(collector);
var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity);
var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection));
- result.StorageId = readSectionResult.StorageId;
- result.AssessmentLayerOne = readSectionResult.AssessmentLayerOne;
- result.AssessmentLayerTwoA = readSectionResult.AssessmentLayerTwoA;
- result.AssessmentLayerThree = readSectionResult.AssessmentLayerThree;
+
+ sectionResultEntity.Read(result, collector);
}
}
@@ -283,7 +268,7 @@
internal static void ReadAsStandAloneFailureMechanism(this FailureMechanismEntity entity, IFailureMechanism failureMechanism, ReadConversionCollector collector)
{
failureMechanism.StorageId = entity.FailureMechanismEntityId;
- failureMechanism.IsRelevant = entity.IsRelevant == 1;
+ failureMechanism.IsRelevant = Convert.ToBoolean(entity.IsRelevant);
failureMechanism.Comments = entity.Comments;
entity.ReadFailureMechanismSections(failureMechanism, collector);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwardsSectionResultEntityReadExtensions.cs
===================================================================
diff -u -rc5499aa0c2af6b5b54c329cbed1a39706bf49cd3 -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwardsSectionResultEntityReadExtensions.cs (.../GrassCoverErosionInwardsSectionResultEntityReadExtensions.cs) (revision c5499aa0c2af6b5b54c329cbed1a39706bf49cd3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionInwardsSectionResultEntityReadExtensions.cs (.../GrassCoverErosionInwardsSectionResultEntityReadExtensions.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -37,22 +37,24 @@
/// .
///
/// The to create for.
+ /// The target of the read operation.
/// The object keeping track of read operations.
/// A new .
/// Thrown when is null.
- internal static GrassCoverErosionInwardsFailureMechanismSectionResult Read(this GrassCoverErosionInwardsSectionResultEntity entity, ReadConversionCollector collector)
+ internal static void Read(this GrassCoverErosionInwardsSectionResultEntity entity, GrassCoverErosionInwardsFailureMechanismSectionResult sectionResult, ReadConversionCollector collector)
{
if (collector == null)
{
throw new ArgumentNullException("collector");
}
- var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(collector.Get(entity.FailureMechanismSectionEntity))
+ if (sectionResult == null)
{
- StorageId = entity.GrassCoverErosionInwardsSectionResultEntityId,
- AssessmentLayerOne = Convert.ToBoolean(entity.LayerOne),
- AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNanableDouble()
- };
- return sectionResult;
+ throw new ArgumentNullException("sectionResult");
+ }
+
+ sectionResult.StorageId = entity.GrassCoverErosionInwardsSectionResultEntityId;
+ sectionResult.AssessmentLayerOne = Convert.ToBoolean(entity.LayerOne);
+ sectionResult.AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNanableDouble();
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructuresSectionResultEntityReadExtensions.cs
===================================================================
diff -u -r0868d78756c7992a83a096f3d3759046c2dbb217 -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructuresSectionResultEntityReadExtensions.cs (.../HeightStructuresSectionResultEntityReadExtensions.cs) (revision 0868d78756c7992a83a096f3d3759046c2dbb217)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructuresSectionResultEntityReadExtensions.cs (.../HeightStructuresSectionResultEntityReadExtensions.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -37,22 +37,23 @@
/// .
///
/// The to create for.
+ /// The target of the read operation.
/// The object keeping track of read operations.
/// A new .
/// Thrown when is null.
- internal static HeightStructuresFailureMechanismSectionResult Read(this HeightStructuresSectionResultEntity entity, ReadConversionCollector collector)
+ internal static void Read(this HeightStructuresSectionResultEntity entity, HeightStructuresFailureMechanismSectionResult sectionResult, ReadConversionCollector collector)
{
if (collector == null)
{
throw new ArgumentNullException("collector");
- }
- var sectionResult = new HeightStructuresFailureMechanismSectionResult(collector.Get(entity.FailureMechanismSectionEntity))
+ }
+ if (sectionResult == null)
{
- StorageId = entity.HeightStructuresSectionResultEntityId,
- AssessmentLayerOne = Convert.ToBoolean(entity.LayerOne),
- AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNanableDouble()
- };
- return sectionResult;
+ throw new ArgumentNullException("sectionResult");
+ }
+ sectionResult.StorageId = entity.HeightStructuresSectionResultEntityId;
+ sectionResult.AssessmentLayerOne = Convert.ToBoolean(entity.LayerOne);
+ sectionResult.AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNanableDouble();
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/PipingSectionResultEntityReadExtensions.cs
===================================================================
diff -u -rc5499aa0c2af6b5b54c329cbed1a39706bf49cd3 -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/PipingSectionResultEntityReadExtensions.cs (.../PipingSectionResultEntityReadExtensions.cs) (revision c5499aa0c2af6b5b54c329cbed1a39706bf49cd3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/PipingSectionResultEntityReadExtensions.cs (.../PipingSectionResultEntityReadExtensions.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -37,22 +37,23 @@
/// .
///
/// The to create for.
+ /// The target of the read operation.
/// The object keeping track of read operations.
/// A new .
/// Thrown when is null.
- internal static PipingFailureMechanismSectionResult Read(this PipingSectionResultEntity entity, ReadConversionCollector collector)
+ internal static void Read(this PipingSectionResultEntity entity, PipingFailureMechanismSectionResult sectionResult, ReadConversionCollector collector)
{
if (collector == null)
{
throw new ArgumentNullException("collector");
}
- var sectionResult = new PipingFailureMechanismSectionResult(collector.Get(entity.FailureMechanismSectionEntity))
+ if (sectionResult == null)
{
- StorageId = entity.PipingSectionResultEntityId,
- AssessmentLayerOne = Convert.ToBoolean(entity.LayerOne),
- AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNanableDouble()
- };
- return sectionResult;
+ throw new ArgumentNullException("sectionResult");
+ }
+ sectionResult.StorageId = entity.PipingSectionResultEntityId;
+ sectionResult.AssessmentLayerOne = Convert.ToBoolean(entity.LayerOne);
+ sectionResult.AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNanableDouble();
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs
===================================================================
diff -u -rebad637e9483d348a5efe2fe902d56aa91bf6a31 -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs (.../StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs) (revision ebad637e9483d348a5efe2fe902d56aa91bf6a31)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs (.../StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensions.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -37,22 +37,23 @@
/// .
///
/// The to create for.
+ /// The target of the read operation.
/// The object keeping track of read operations.
/// A new .
/// Thrown when is null.
- internal static StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult Read(this StrengthStabilityLengthwiseConstructionSectionResultEntity entity, ReadConversionCollector collector)
+ internal static void Read(this StrengthStabilityLengthwiseConstructionSectionResultEntity entity, StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult sectionResult, ReadConversionCollector collector)
{
if (collector == null)
{
throw new ArgumentNullException("collector");
}
- var sectionResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(collector.Get(entity.FailureMechanismSectionEntity))
+ if (sectionResult == null)
{
- StorageId = entity.StrengthStabilityLengthwiseConstructionSectionResultEntityId,
- AssessmentLayerOne = Convert.ToBoolean(entity.LayerOne),
- AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNanableDouble()
- };
- return sectionResult;
+ throw new ArgumentNullException("sectionResult");
+ }
+ sectionResult.StorageId = entity.StrengthStabilityLengthwiseConstructionSectionResultEntityId;
+ sectionResult.AssessmentLayerOne = Convert.ToBoolean(entity.LayerOne);
+ sectionResult.AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNanableDouble();
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/TechnicalInnovationSectionResultEntityReadExtensions.cs
===================================================================
diff -u -r2fe46c62134fde70ada240fa952971444177be90 -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/TechnicalInnovationSectionResultEntityReadExtensions.cs (.../TechnicalInnovationSectionResultEntityReadExtensions.cs) (revision 2fe46c62134fde70ada240fa952971444177be90)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/TechnicalInnovationSectionResultEntityReadExtensions.cs (.../TechnicalInnovationSectionResultEntityReadExtensions.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -37,21 +37,23 @@
/// .
///
/// The to create for.
+ /// The target of the read operation.
/// The object keeping track of read operations.
/// A new .
/// Thrown when is null.
- internal static TechnicalInnovationFailureMechanismSectionResult Read(this TechnicalInnovationSectionResultEntity entity, ReadConversionCollector collector)
+ internal static TechnicalInnovationFailureMechanismSectionResult Read(this TechnicalInnovationSectionResultEntity entity, TechnicalInnovationFailureMechanismSectionResult sectionResult, ReadConversionCollector collector)
{
if (collector == null)
{
throw new ArgumentNullException("collector");
}
- var sectionResult = new TechnicalInnovationFailureMechanismSectionResult(collector.Get(entity.FailureMechanismSectionEntity))
+ if (sectionResult == null)
{
- StorageId = entity.TechnicalInnovationSectionResultEntityId,
- AssessmentLayerOne = Convert.ToBoolean(entity.LayerOne),
- AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNanableDouble()
- };
+ throw new ArgumentNullException("sectionResult");
+ }
+ sectionResult.StorageId = entity.TechnicalInnovationSectionResultEntityId;
+ sectionResult.AssessmentLayerOne = Convert.ToBoolean(entity.LayerOne);
+ sectionResult.AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNanableDouble();
return sectionResult;
}
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensions.cs
===================================================================
diff -u -r2fe46c62134fde70ada240fa952971444177be90 -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensions.cs (.../WaterPressureAsphaltCoverSectionResultEntityReadExtensions.cs) (revision 2fe46c62134fde70ada240fa952971444177be90)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensions.cs (.../WaterPressureAsphaltCoverSectionResultEntityReadExtensions.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -37,22 +37,23 @@
/// .
///
/// The to create for.
+ /// The target of the read operation.
/// The object keeping track of read operations.
/// A new .
/// Thrown when is null.
- internal static WaterPressureAsphaltCoverFailureMechanismSectionResult Read(this WaterPressureAsphaltCoverSectionResultEntity entity, ReadConversionCollector collector)
+ internal static void Read(this WaterPressureAsphaltCoverSectionResultEntity entity, WaterPressureAsphaltCoverFailureMechanismSectionResult sectionResult, ReadConversionCollector collector)
{
if (collector == null)
{
throw new ArgumentNullException("collector");
}
- var sectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(collector.Get(entity.FailureMechanismSectionEntity))
+ if (sectionResult == null)
{
- StorageId = entity.WaterPressureAsphaltCoverSectionResultEntityId,
- AssessmentLayerOne = Convert.ToBoolean(entity.LayerOne),
- AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNanableDouble()
- };
- return sectionResult;
+ throw new ArgumentNullException("sectionResult");
+ }
+ sectionResult.StorageId = entity.WaterPressureAsphaltCoverSectionResultEntityId;
+ sectionResult.AssessmentLayerOne = Convert.ToBoolean(entity.LayerOne);
+ sectionResult.AssessmentLayerThree = (RoundedDouble) entity.LayerThree.ToNanableDouble();
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructureSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -r1cd3618f5f8916ef15992d69ec3b447b311c2f72 -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructureSectionResultEntityReadExtensionsTest.cs (.../ClosingStructureSectionResultEntityReadExtensionsTest.cs) (revision 1cd3618f5f8916ef15992d69ec3b447b311c2f72)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructureSectionResultEntityReadExtensionsTest.cs (.../ClosingStructureSectionResultEntityReadExtensionsTest.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -24,6 +24,7 @@
using Application.Ringtoets.Storage.Read;
using Application.Ringtoets.Storage.TestUtil;
using NUnit.Framework;
+using Ringtoets.Integration.Data.StandAlone.SectionResults;
namespace Application.Ringtoets.Storage.Test.Read
{
@@ -37,14 +38,28 @@
var entity = new ClosingStructureSectionResultEntity();
// Call
- TestDelegate call = () => entity.Read(null);
+ TestDelegate call = () => entity.Read(new ClosingStructureFailureMechanismSectionResult(new TestFailureMechanismSection()), null);
// Assert
string paramName = Assert.Throws(call).ParamName;
Assert.AreEqual("collector", paramName);
}
[Test]
+ public void Read_SectionResultIsNull_ThrowArgumentNullException()
+ {
+ // Setup
+ var entity = new ClosingStructureSectionResultEntity();
+
+ // Call
+ TestDelegate call = () => entity.Read(null, new ReadConversionCollector());
+
+ // Assert
+ string paramName = Assert.Throws(call).ParamName;
+ Assert.AreEqual("sectionResult", paramName);
+ }
+
+ [Test]
[TestCase(true)]
[TestCase(false)]
public void Read_WithDecimalParameterValues_ReturnClosingStructureSoilLayerWithDoubleParameterValues(bool layerOne)
@@ -66,16 +81,17 @@
LayerOne = Convert.ToByte(layerOne),
FailureMechanismSectionEntity = failureMechanismSectionEntity
};
+ var sectionResult = new ClosingStructureFailureMechanismSectionResult(new TestFailureMechanismSection());
// Call
- var result = entity.Read(collector);
+ entity.Read(sectionResult, collector);
// Assert
- Assert.IsNotNull(result);
- Assert.AreEqual(entityId, result.StorageId);
- Assert.AreEqual(layerOne, result.AssessmentLayerOne);
- Assert.AreEqual(layerTwoA, result.AssessmentLayerTwoA, 1e-6);
- Assert.AreEqual(layerThree, result.AssessmentLayerThree, 1e-6);
+ Assert.IsNotNull(sectionResult);
+ Assert.AreEqual(entityId, sectionResult.StorageId);
+ Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+ Assert.AreEqual(layerTwoA, sectionResult.AssessmentLayerTwoA, 1e-6);
+ Assert.AreEqual(layerThree, sectionResult.AssessmentLayerThree, 1e-6);
}
[Test]
@@ -94,12 +110,13 @@
LayerThree = Convert.ToDecimal(new Random(21).NextDouble()),
FailureMechanismSectionEntity = failureMechanismSectionEntity
};
+ var sectionResult = new ClosingStructureFailureMechanismSectionResult(new TestFailureMechanismSection());
// Call
- var layer = entity.Read(collector);
+ entity.Read(sectionResult, collector);
// Assert
- Assert.IsNaN(layer.AssessmentLayerTwoA);
+ Assert.IsNaN(sectionResult.AssessmentLayerTwoA);
}
[Test]
@@ -118,12 +135,13 @@
LayerThree = null,
FailureMechanismSectionEntity = failureMechanismSectionEntity
};
+ var sectionResult = new ClosingStructureFailureMechanismSectionResult(new TestFailureMechanismSection());
// Call
- var layer = entity.Read(collector);
+ entity.Read(sectionResult, collector);
// Assert
- Assert.IsNaN(layer.AssessmentLayerThree);
+ Assert.IsNaN(sectionResult.AssessmentLayerThree);
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -re0ef393f7069a18d7e160aceaf91f603dfc8c5ae -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs) (revision e0ef393f7069a18d7e160aceaf91f603dfc8c5ae)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -24,20 +24,35 @@
using Application.Ringtoets.Storage.Read;
using Application.Ringtoets.Storage.TestUtil;
using NUnit.Framework;
+using Ringtoets.GrassCoverErosionInwards.Data;
namespace Application.Ringtoets.Storage.Test.Read
{
[TestFixture]
public class GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest
{
[Test]
+ public void Read_SectionResultIsNull_ThrowArgumentNullException()
+ {
+ // Setup
+ var entity = new GrassCoverErosionInwardsSectionResultEntity();
+
+ // Call
+ TestDelegate call = () => entity.Read(null, new ReadConversionCollector());
+
+ // Assert
+ string paramName = Assert.Throws(call).ParamName;
+ Assert.AreEqual("sectionResult", paramName);
+ }
+
+ [Test]
public void Read_CollectorIsNull_ThrowArgumentNullException()
{
// Setup
var entity = new GrassCoverErosionInwardsSectionResultEntity();
// Call
- TestDelegate call = () => entity.Read(null);
+ TestDelegate call = () => entity.Read(new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection()), null);
// Assert
string paramName = Assert.Throws(call).ParamName;
@@ -64,15 +79,16 @@
LayerOne = Convert.ToByte(layerOne),
FailureMechanismSectionEntity = failureMechanismSectionEntity
};
+ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
// Call
- var result = entity.Read(collector);
+ entity.Read(sectionResult, collector);
// Assert
- Assert.IsNotNull(result);
- Assert.AreEqual(entityId, result.StorageId);
- Assert.AreEqual(layerOne, result.AssessmentLayerOne);
- Assert.AreEqual(layerThree, result.AssessmentLayerThree, 1e-6);
+ Assert.IsNotNull(sectionResult);
+ Assert.AreEqual(entityId, sectionResult.StorageId);
+ Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+ Assert.AreEqual(layerThree, sectionResult.AssessmentLayerThree, 1e-6);
}
[Test]
@@ -90,12 +106,13 @@
LayerThree = null,
FailureMechanismSectionEntity = failureMechanismSectionEntity
};
+ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(new TestFailureMechanismSection());
// Call
- var layer = entity.Read(collector);
+ entity.Read(sectionResult, collector);
// Assert
- Assert.IsNaN(layer.AssessmentLayerThree);
+ Assert.IsNaN(sectionResult.AssessmentLayerThree);
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructuresSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -re0ef393f7069a18d7e160aceaf91f603dfc8c5ae -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructuresSectionResultEntityReadExtensionsTest.cs (.../HeightStructuresSectionResultEntityReadExtensionsTest.cs) (revision e0ef393f7069a18d7e160aceaf91f603dfc8c5ae)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructuresSectionResultEntityReadExtensionsTest.cs (.../HeightStructuresSectionResultEntityReadExtensionsTest.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -24,6 +24,7 @@
using Application.Ringtoets.Storage.Read;
using Application.Ringtoets.Storage.TestUtil;
using NUnit.Framework;
+using Ringtoets.HeightStructures.Data;
namespace Application.Ringtoets.Storage.Test.Read
{
@@ -37,14 +38,28 @@
var entity = new HeightStructuresSectionResultEntity();
// Call
- TestDelegate call = () => entity.Read(null);
+ TestDelegate call = () => entity.Read(new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection()), null);
// Assert
string paramName = Assert.Throws(call).ParamName;
Assert.AreEqual("collector", paramName);
}
[Test]
+ public void Read_SectionResultIsNull_ThrowArgumentNullException()
+ {
+ // Setup
+ var entity = new ClosingStructureSectionResultEntity();
+
+ // Call
+ TestDelegate call = () => entity.Read(null, new ReadConversionCollector());
+
+ // Assert
+ string paramName = Assert.Throws(call).ParamName;
+ Assert.AreEqual("sectionResult", paramName);
+ }
+
+ [Test]
[TestCase(true)]
[TestCase(false)]
public void Read_WithDecimalParameterValues_ReturnHeightStructuresSoilLayerWithDoubleParameterValues(bool layerOne)
@@ -64,15 +79,16 @@
LayerOne = Convert.ToByte(layerOne),
FailureMechanismSectionEntity = failureMechanismSectionEntity
};
+ var sectionResult = new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
// Call
- var result = entity.Read(collector);
+ entity.Read(sectionResult, collector);
// Assert
- Assert.IsNotNull(result);
- Assert.AreEqual(entityId, result.StorageId);
- Assert.AreEqual(layerOne, result.AssessmentLayerOne);
- Assert.AreEqual(layerThree, result.AssessmentLayerThree, 1e-6);
+ Assert.IsNotNull(sectionResult);
+ Assert.AreEqual(entityId, sectionResult.StorageId);
+ Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+ Assert.AreEqual(layerThree, sectionResult.AssessmentLayerThree, 1e-6);
}
[Test]
@@ -90,12 +106,13 @@
LayerThree = null,
FailureMechanismSectionEntity = failureMechanismSectionEntity
};
+ var sectionResult = new HeightStructuresFailureMechanismSectionResult(new TestFailureMechanismSection());
// Call
- var layer = entity.Read(collector);
+ entity.Read(sectionResult, collector);
// Assert
- Assert.IsNaN(layer.AssessmentLayerThree);
+ Assert.IsNaN(sectionResult.AssessmentLayerThree);
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/PipingSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -re0ef393f7069a18d7e160aceaf91f603dfc8c5ae -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/PipingSectionResultEntityReadExtensionsTest.cs (.../PipingSectionResultEntityReadExtensionsTest.cs) (revision e0ef393f7069a18d7e160aceaf91f603dfc8c5ae)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/PipingSectionResultEntityReadExtensionsTest.cs (.../PipingSectionResultEntityReadExtensionsTest.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -24,6 +24,7 @@
using Application.Ringtoets.Storage.Read;
using Application.Ringtoets.Storage.TestUtil;
using NUnit.Framework;
+using Ringtoets.Piping.Data;
namespace Application.Ringtoets.Storage.Test.Read
{
@@ -37,14 +38,28 @@
var entity = new PipingSectionResultEntity();
// Call
- TestDelegate call = () => entity.Read(null);
+ TestDelegate call = () => entity.Read(new PipingFailureMechanismSectionResult(new TestFailureMechanismSection()), null);
// Assert
string paramName = Assert.Throws(call).ParamName;
Assert.AreEqual("collector", paramName);
}
[Test]
+ public void Read_SectionResultIsNull_ThrowArgumentNullException()
+ {
+ // Setup
+ var entity = new ClosingStructureSectionResultEntity();
+
+ // Call
+ TestDelegate call = () => entity.Read(null, new ReadConversionCollector());
+
+ // Assert
+ string paramName = Assert.Throws(call).ParamName;
+ Assert.AreEqual("sectionResult", paramName);
+ }
+
+ [Test]
[TestCase(true)]
[TestCase(false)]
public void Read_WithDecimalParameterValues_ReturnPipingSoilLayerWithDoubleParameterValues(bool layerOne)
@@ -65,14 +80,16 @@
FailureMechanismSectionEntity = failureMechanismSectionEntity
};
+ var sectionResult = new PipingFailureMechanismSectionResult(new TestFailureMechanismSection());
+
// Call
- var result = entity.Read(collector);
+ entity.Read(sectionResult, collector);
// Assert
- Assert.IsNotNull(result);
- Assert.AreEqual(entityId, result.StorageId);
- Assert.AreEqual(layerOne, result.AssessmentLayerOne);
- Assert.AreEqual(layerThree, result.AssessmentLayerThree, 1e-6);
+ Assert.IsNotNull(sectionResult);
+ Assert.AreEqual(entityId, sectionResult.StorageId);
+ Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+ Assert.AreEqual(layerThree, sectionResult.AssessmentLayerThree, 1e-6);
}
[Test]
@@ -90,12 +107,13 @@
LayerThree = null,
FailureMechanismSectionEntity = failureMechanismSectionEntity
};
+ var sectionResult = new PipingFailureMechanismSectionResult(new TestFailureMechanismSection());
// Call
- var layer = entity.Read(collector);
+ entity.Read(sectionResult, collector);
// Assert
- Assert.IsNaN(layer.AssessmentLayerThree);
+ Assert.IsNaN(sectionResult.AssessmentLayerThree);
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -re0ef393f7069a18d7e160aceaf91f603dfc8c5ae -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs (.../StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs) (revision e0ef393f7069a18d7e160aceaf91f603dfc8c5ae)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs (.../StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -24,6 +24,7 @@
using Application.Ringtoets.Storage.Read;
using Application.Ringtoets.Storage.TestUtil;
using NUnit.Framework;
+using Ringtoets.Integration.Data.StandAlone.SectionResults;
namespace Application.Ringtoets.Storage.Test.Read
{
@@ -37,14 +38,30 @@
var entity = new StrengthStabilityLengthwiseConstructionSectionResultEntity();
// Call
- TestDelegate call = () => entity.Read(null);
+ TestDelegate call = () => entity.Read(
+ new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(new TestFailureMechanismSection()),
+ null);
// Assert
string paramName = Assert.Throws(call).ParamName;
Assert.AreEqual("collector", paramName);
}
[Test]
+ public void Read_SectionResultIsNull_ThrowArgumentNullException()
+ {
+ // Setup
+ var entity = new ClosingStructureSectionResultEntity();
+
+ // Call
+ TestDelegate call = () => entity.Read(null, new ReadConversionCollector());
+
+ // Assert
+ string paramName = Assert.Throws(call).ParamName;
+ Assert.AreEqual("sectionResult", paramName);
+ }
+
+ [Test]
[TestCase(true)]
[TestCase(false)]
public void Read_WithDecimalParameterValues_ReturnStrengthStabilityLengthwiseConstructionSoilLayerWithDoubleParameterValues(bool layerOne)
@@ -64,15 +81,16 @@
LayerOne = Convert.ToByte(layerOne),
FailureMechanismSectionEntity = failureMechanismSectionEntity
};
+ var sectionResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(new TestFailureMechanismSection());
// Call
- var result = entity.Read(collector);
+ entity.Read(sectionResult, collector);
// Assert
- Assert.IsNotNull(result);
- Assert.AreEqual(entityId, result.StorageId);
- Assert.AreEqual(layerOne, result.AssessmentLayerOne);
- Assert.AreEqual(layerThree, result.AssessmentLayerThree, 1e-6);
+ Assert.IsNotNull(sectionResult);
+ Assert.AreEqual(entityId, sectionResult.StorageId);
+ Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+ Assert.AreEqual(layerThree, sectionResult.AssessmentLayerThree, 1e-6);
}
[Test]
@@ -90,12 +108,13 @@
LayerThree = null,
FailureMechanismSectionEntity = failureMechanismSectionEntity
};
+ var sectionResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(new TestFailureMechanismSection());
// Call
- var layer = entity.Read(collector);
+ entity.Read(sectionResult, collector);
// Assert
- Assert.IsNaN(layer.AssessmentLayerThree);
+ Assert.IsNaN(sectionResult.AssessmentLayerThree);
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/TechnicalInnovationSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -re0ef393f7069a18d7e160aceaf91f603dfc8c5ae -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/TechnicalInnovationSectionResultEntityReadExtensionsTest.cs (.../TechnicalInnovationSectionResultEntityReadExtensionsTest.cs) (revision e0ef393f7069a18d7e160aceaf91f603dfc8c5ae)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/TechnicalInnovationSectionResultEntityReadExtensionsTest.cs (.../TechnicalInnovationSectionResultEntityReadExtensionsTest.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -24,6 +24,7 @@
using Application.Ringtoets.Storage.Read;
using Application.Ringtoets.Storage.TestUtil;
using NUnit.Framework;
+using Ringtoets.Integration.Data.StandAlone.SectionResults;
namespace Application.Ringtoets.Storage.Test.Read
{
@@ -37,14 +38,28 @@
var entity = new TechnicalInnovationSectionResultEntity();
// Call
- TestDelegate call = () => entity.Read(null);
+ TestDelegate call = () => entity.Read(new TechnicalInnovationFailureMechanismSectionResult(new TestFailureMechanismSection()), null);
// Assert
string paramName = Assert.Throws(call).ParamName;
Assert.AreEqual("collector", paramName);
}
[Test]
+ public void Read_SectionResultIsNull_ThrowArgumentNullException()
+ {
+ // Setup
+ var entity = new ClosingStructureSectionResultEntity();
+
+ // Call
+ TestDelegate call = () => entity.Read(null, new ReadConversionCollector());
+
+ // Assert
+ string paramName = Assert.Throws(call).ParamName;
+ Assert.AreEqual("sectionResult", paramName);
+ }
+
+ [Test]
[TestCase(true)]
[TestCase(false)]
public void Read_WithDecimalParameterValues_ReturnTechnicalInnovationSoilLayerWithDoubleParameterValues(bool layerOne)
@@ -64,15 +79,16 @@
LayerOne = Convert.ToByte(layerOne),
FailureMechanismSectionEntity = failureMechanismSectionEntity
};
+ var sectionResult = new TechnicalInnovationFailureMechanismSectionResult(new TestFailureMechanismSection());
// Call
- var result = entity.Read(collector);
+ entity.Read(sectionResult, collector);
// Assert
- Assert.IsNotNull(result);
- Assert.AreEqual(entityId, result.StorageId);
- Assert.AreEqual(layerOne, result.AssessmentLayerOne);
- Assert.AreEqual(layerThree, result.AssessmentLayerThree, 1e-6);
+ Assert.IsNotNull(sectionResult);
+ Assert.AreEqual(entityId, sectionResult.StorageId);
+ Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+ Assert.AreEqual(layerThree, sectionResult.AssessmentLayerThree, 1e-6);
}
[Test]
@@ -90,12 +106,13 @@
LayerThree = null,
FailureMechanismSectionEntity = failureMechanismSectionEntity
};
+ var sectionResult = new TechnicalInnovationFailureMechanismSectionResult(new TestFailureMechanismSection());
// Call
- var layer = entity.Read(collector);
+ entity.Read(sectionResult, collector);
// Assert
- Assert.IsNaN(layer.AssessmentLayerThree);
+ Assert.IsNaN(sectionResult.AssessmentLayerThree);
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -re0ef393f7069a18d7e160aceaf91f603dfc8c5ae -r838250fef0c200dbbffa9a562ca5935fdc500d19
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs (.../WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs) (revision e0ef393f7069a18d7e160aceaf91f603dfc8c5ae)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs (.../WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs) (revision 838250fef0c200dbbffa9a562ca5935fdc500d19)
@@ -24,6 +24,7 @@
using Application.Ringtoets.Storage.Read;
using Application.Ringtoets.Storage.TestUtil;
using NUnit.Framework;
+using Ringtoets.Integration.Data.StandAlone.SectionResults;
namespace Application.Ringtoets.Storage.Test.Read
{
@@ -37,14 +38,28 @@
var entity = new WaterPressureAsphaltCoverSectionResultEntity();
// Call
- TestDelegate call = () => entity.Read(null);
+ TestDelegate call = () => entity.Read(new WaterPressureAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection()), null);
// Assert
string paramName = Assert.Throws(call).ParamName;
Assert.AreEqual("collector", paramName);
}
[Test]
+ public void Read_SectionResultIsNull_ThrowArgumentNullException()
+ {
+ // Setup
+ var entity = new ClosingStructureSectionResultEntity();
+
+ // Call
+ TestDelegate call = () => entity.Read(null, new ReadConversionCollector());
+
+ // Assert
+ string paramName = Assert.Throws(call).ParamName;
+ Assert.AreEqual("sectionResult", paramName);
+ }
+
+ [Test]
[TestCase(true)]
[TestCase(false)]
public void Read_WithDecimalParameterValues_ReturnWaterPressureAsphaltCoverSoilLayerWithDoubleParameterValues(bool layerOne)
@@ -64,15 +79,16 @@
LayerOne = Convert.ToByte(layerOne),
FailureMechanismSectionEntity = failureMechanismSectionEntity
};
+ var sectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection());
// Call
- var result = entity.Read(collector);
+ entity.Read(sectionResult, collector);
// Assert
- Assert.IsNotNull(result);
- Assert.AreEqual(entityId, result.StorageId);
- Assert.AreEqual(layerOne, result.AssessmentLayerOne);
- Assert.AreEqual(layerThree, result.AssessmentLayerThree, 1e-6);
+ Assert.IsNotNull(sectionResult);
+ Assert.AreEqual(entityId, sectionResult.StorageId);
+ Assert.AreEqual(layerOne, sectionResult.AssessmentLayerOne);
+ Assert.AreEqual(layerThree, sectionResult.AssessmentLayerThree, 1e-6);
}
[Test]
@@ -90,12 +106,13 @@
LayerThree = null,
FailureMechanismSectionEntity = failureMechanismSectionEntity
};
+ var sectionResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(new TestFailureMechanismSection());
// Call
- var layer = entity.Read(collector);
+ entity.Read(sectionResult, collector);
// Assert
- Assert.IsNaN(layer.AssessmentLayerThree);
+ Assert.IsNaN(sectionResult.AssessmentLayerThree);
}
}
}
\ No newline at end of file