Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensions.cs =================================================================== diff -u -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6 -rbeb484b744b2d77062ca98ef4ebf7cd32ee5a0cd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensions.cs (.../ClosingStructuresFailureMechanismCreateExtensions.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensions.cs (.../ClosingStructuresFailureMechanismCreateExtensions.cs) (revision beb484b744b2d77062ca98ef4ebf7cd32ee5a0cd) @@ -23,6 +23,7 @@ using System.Collections.Generic; using Application.Ringtoets.Storage.DbContext; using Ringtoets.ClosingStructures.Data; +using Ringtoets.Common.Data.DikeProfiles; namespace Application.Ringtoets.Storage.Create.ClosingStructures { @@ -42,6 +43,7 @@ { var entity = mechanism.Create(FailureMechanismType.ReliabilityClosingOfStructure, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); + AddEntitiesForForeshoreProfiles(mechanism.ForeshoreProfiles, entity, registry); return entity; } @@ -57,5 +59,17 @@ section.ClosingStructuresSectionResultEntities.Add(sectionResultEntity); } } + + private static void AddEntitiesForForeshoreProfiles( + IList foreshoreProfiles, + FailureMechanismEntity entity, + PersistenceRegistry registry) + { + for (int i = 0; i < foreshoreProfiles.Count; i++) + { + ForeshoreProfileEntity foreshoreProfileEntity = foreshoreProfiles[i].Create(registry, i); + entity.ForeshoreProfileEntities.Add(foreshoreProfileEntity); + } + } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -rbeb484b744b2d77062ca98ef4ebf7cd32ee5a0cd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs (.../HeightStructuresFailureMechanismCreateExtensions.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs (.../HeightStructuresFailureMechanismCreateExtensions.cs) (revision beb484b744b2d77062ca98ef4ebf7cd32ee5a0cd) @@ -22,6 +22,7 @@ using System; using System.Collections.Generic; using Application.Ringtoets.Storage.DbContext; +using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.HeightStructures.Data; namespace Application.Ringtoets.Storage.Create.HeightStructures @@ -42,6 +43,7 @@ { var entity = mechanism.Create(FailureMechanismType.StructureHeight, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); + AddEntitiesForForeshoreProfiles(mechanism.ForeshoreProfiles, entity, registry); return entity; } @@ -57,5 +59,17 @@ section.HeightStructuresSectionResultEntities.Add(sectionResultEntity); } } + + private static void AddEntitiesForForeshoreProfiles( + IList foreshoreProfiles, + FailureMechanismEntity entity, + PersistenceRegistry registry) + { + for (int i = 0; i < foreshoreProfiles.Count; i++) + { + ForeshoreProfileEntity foreshoreProfileEntity = foreshoreProfiles[i].Create(registry, i); + entity.ForeshoreProfileEntities.Add(foreshoreProfileEntity); + } + } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensions.cs =================================================================== diff -u -rae14c5d4e4624fa87390e6d63bb419c648e12dda -rbeb484b744b2d77062ca98ef4ebf7cd32ee5a0cd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensions.cs (.../StabilityPointStructuresFailureMechanismCreateExtensions.cs) (revision ae14c5d4e4624fa87390e6d63bb419c648e12dda) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensions.cs (.../StabilityPointStructuresFailureMechanismCreateExtensions.cs) (revision beb484b744b2d77062ca98ef4ebf7cd32ee5a0cd) @@ -22,6 +22,7 @@ using System; using System.Collections.Generic; using Application.Ringtoets.Storage.DbContext; +using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.StabilityPointStructures.Data; namespace Application.Ringtoets.Storage.Create.StabilityPointStructures @@ -42,6 +43,7 @@ { var entity = mechanism.Create(FailureMechanismType.StabilityPointStructures, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); + AddEntitiesForForeshoreProfiles(mechanism.ForeshoreProfiles, entity, registry); return entity; } @@ -57,5 +59,17 @@ section.StabilityPointStructuresSectionResultEntities.Add(sectionResultEntity); } } + + private static void AddEntitiesForForeshoreProfiles( + IList foreshoreProfiles, + FailureMechanismEntity entity, + PersistenceRegistry registry) + { + for (int i = 0; i < foreshoreProfiles.Count; i++) + { + ForeshoreProfileEntity foreshoreProfileEntity = foreshoreProfiles[i].Create(registry, i); + entity.ForeshoreProfileEntities.Add(foreshoreProfileEntity); + } + } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -r7453ee2b089e9f9842fbab8642b199074a47117f -rbeb484b744b2d77062ca98ef4ebf7cd32ee5a0cd --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 7453ee2b089e9f9842fbab8642b199074a47117f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision beb484b744b2d77062ca98ef4ebf7cd32ee5a0cd) @@ -220,6 +220,7 @@ { entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); entity.ReadHeightStructuresMechanismSectionResults(failureMechanism, collector); + entity.ReadForeshoreProfiles(failureMechanism.ForeshoreProfiles, collector); } private static void ReadHeightStructuresMechanismSectionResults(this FailureMechanismEntity entity, HeightStructuresFailureMechanism failureMechanism, ReadConversionCollector collector) @@ -328,6 +329,7 @@ { entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); entity.ReadClosingStructuresMechanismSectionResults(failureMechanism, collector); + entity.ReadForeshoreProfiles(failureMechanism.ForeshoreProfiles, collector); } private static void ReadClosingStructuresMechanismSectionResults(this FailureMechanismEntity entity, ClosingStructuresFailureMechanism failureMechanism, ReadConversionCollector collector) @@ -689,6 +691,7 @@ { entity.ReadCommonFailureMechanismProperties(failureMechanism, collector); entity.ReadStabilityPointStructuresMechanismSectionResults(failureMechanism, collector); + entity.ReadForeshoreProfiles(failureMechanism.ForeshoreProfiles, collector); } private static void ReadStabilityPointStructuresMechanismSectionResults(this FailureMechanismEntity entity, StabilityPointStructuresFailureMechanism failureMechanism, ReadConversionCollector collector) Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6 -rbeb484b744b2d77062ca98ef4ebf7cd32ee5a0cd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs (.../ClosingStructuresFailureMechanismCreateExtensionsTest.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs (.../ClosingStructuresFailureMechanismCreateExtensionsTest.cs) (revision beb484b744b2d77062ca98ef4ebf7cd32ee5a0cd) @@ -117,5 +117,24 @@ Assert.AreEqual(1, entity.FailureMechanismSectionEntities.Count); Assert.AreEqual(1, entity.FailureMechanismSectionEntities.SelectMany(fms => fms.ClosingStructuresSectionResultEntities).Count()); } + + [Test] + public void Create_WithForeShoreProfiles_ForeShoreProfileEntitiesCreated() + { + // Setup + var profile = new TestForeshoreProfile(); + + var failureMechanism = new ClosingStructuresFailureMechanism(); + failureMechanism.ForeshoreProfiles.Add(profile); + + var persistenceRegistry = new PersistenceRegistry(); + + // Call + var entity = failureMechanism.Create(persistenceRegistry); + + // Assert + Assert.AreEqual(1, entity.ForeshoreProfileEntities.Count); + Assert.IsTrue(persistenceRegistry.Contains(profile)); + } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r05013c44d1273bac219a442dc7959706c6bac715 -rbeb484b744b2d77062ca98ef4ebf7cd32ee5a0cd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs (.../HeightStructuresFailureMechanismCreateExtensionsTest.cs) (revision 05013c44d1273bac219a442dc7959706c6bac715) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs (.../HeightStructuresFailureMechanismCreateExtensionsTest.cs) (revision beb484b744b2d77062ca98ef4ebf7cd32ee5a0cd) @@ -117,5 +117,24 @@ Assert.AreEqual(1, entity.FailureMechanismSectionEntities.Count); Assert.AreEqual(1, entity.FailureMechanismSectionEntities.SelectMany(fms => fms.HeightStructuresSectionResultEntities).Count()); } + + [Test] + public void Create_WithForeShoreProfiles_ForeShoreProfileEntitiesCreated() + { + // Setup + var profile = new TestForeshoreProfile(); + + var failureMechanism = new HeightStructuresFailureMechanism(); + failureMechanism.ForeshoreProfiles.Add(profile); + + var persistenceRegistry = new PersistenceRegistry(); + + // Call + var entity = failureMechanism.Create(persistenceRegistry); + + // Assert + Assert.AreEqual(1, entity.ForeshoreProfileEntities.Count); + Assert.IsTrue(persistenceRegistry.Contains(profile)); + } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -rae14c5d4e4624fa87390e6d63bb419c648e12dda -rbeb484b744b2d77062ca98ef4ebf7cd32ee5a0cd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs (.../StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs) (revision ae14c5d4e4624fa87390e6d63bb419c648e12dda) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs (.../StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs) (revision beb484b744b2d77062ca98ef4ebf7cd32ee5a0cd) @@ -117,5 +117,24 @@ Assert.AreEqual(1, entity.FailureMechanismSectionEntities.Count); Assert.AreEqual(1, entity.FailureMechanismSectionEntities.SelectMany(fms => fms.StabilityPointStructuresSectionResultEntities).Count()); } + + [Test] + public void Create_WithForeShoreProfiles_ForeShoreProfileEntitiesCreated() + { + // Setup + var profile = new TestForeshoreProfile(); + + var failureMechanism = new StabilityPointStructuresFailureMechanism(); + failureMechanism.ForeshoreProfiles.Add(profile); + + var persistenceRegistry = new PersistenceRegistry(); + + // Call + var entity = failureMechanism.Create(persistenceRegistry); + + // Assert + Assert.AreEqual(1, entity.ForeshoreProfileEntities.Count); + Assert.IsTrue(persistenceRegistry.Contains(profile)); + } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -rae14c5d4e4624fa87390e6d63bb419c648e12dda -rbeb484b744b2d77062ca98ef4ebf7cd32ee5a0cd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision ae14c5d4e4624fa87390e6d63bb419c648e12dda) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision beb484b744b2d77062ca98ef4ebf7cd32ee5a0cd) @@ -277,6 +277,9 @@ AssertGrassCoverErosionOutwardsFailureMechanism(expectedAssessmentSection.GrassCoverErosionOutwards, actualAssessmentSection.GrassCoverErosionOutwards); AssertStabilityStoneCoverFailureMechanism(expectedAssessmentSection.StabilityStoneCover, actualAssessmentSection.StabilityStoneCover); AssertWaveImpactAsphaltCoverFailureMechanism(expectedAssessmentSection.WaveImpactAsphaltCover, actualAssessmentSection.WaveImpactAsphaltCover); + AssertHeightStructuresFailureMechanism(expectedAssessmentSection.HeightStructures, actualAssessmentSection.HeightStructures); + AssertClosingStructuresFailureMechanism(expectedAssessmentSection.ClosingStructures, actualAssessmentSection.ClosingStructures); + AssertStabilityPointStructuresFailureMechanism(expectedAssessmentSection.StabilityPointStructures, actualAssessmentSection.StabilityPointStructures); IFailureMechanism[] expectedProjectFailureMechanisms = expectedAssessmentSection.GetFailureMechanisms().ToArray(); IFailureMechanism[] actualProjectFailureMechanisms = actualAssessmentSection.GetFailureMechanisms().ToArray(); @@ -880,6 +883,36 @@ } } + #region HeightStructures FailureMechanism + + private static void AssertHeightStructuresFailureMechanism(HeightStructuresFailureMechanism expectedFailureMechanism, + HeightStructuresFailureMechanism actualFailureMechanism) + { + AssertForeshoreProfiles(expectedFailureMechanism.ForeshoreProfiles, actualFailureMechanism.ForeshoreProfiles); + } + + #endregion + + #region ClosingStructures FailureMechanism + + private static void AssertClosingStructuresFailureMechanism(ClosingStructuresFailureMechanism expectedFailureMechanism, + ClosingStructuresFailureMechanism actualFailureMechanism) + { + AssertForeshoreProfiles(expectedFailureMechanism.ForeshoreProfiles, actualFailureMechanism.ForeshoreProfiles); + } + + #endregion + + #region StabilityPointStructures FailureMechanism + + private static void AssertStabilityPointStructuresFailureMechanism(StabilityPointStructuresFailureMechanism expectedFailureMechanism, + StabilityPointStructuresFailureMechanism actualFailureMechanism) + { + AssertForeshoreProfiles(expectedFailureMechanism.ForeshoreProfiles, actualFailureMechanism.ForeshoreProfiles); + } + + #endregion + #region Piping FailureMechanism private static void AssertPipingFailureMechanism(PipingFailureMechanism expectedPipingFailureMechanism, PipingFailureMechanism actualPipingFailureMechanism) Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs =================================================================== diff -u -r7453ee2b089e9f9842fbab8642b199074a47117f -rbeb484b744b2d77062ca98ef4ebf7cd32ee5a0cd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 7453ee2b089e9f9842fbab8642b199074a47117f) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision beb484b744b2d77062ca98ef4ebf7cd32ee5a0cd) @@ -26,12 +26,15 @@ using Application.Ringtoets.Storage.Serializers; using Core.Common.Base.Geometry; using NUnit.Framework; +using Ringtoets.ClosingStructures.Data; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.TestUtil; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionOutwards.Data; +using Ringtoets.HeightStructures.Data; using Ringtoets.Piping.Data; +using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.WaveImpactAsphaltCover.Data; @@ -826,5 +829,134 @@ } #endregion + + #region Height Structures + + [Test] + public void ReadAsHeightStructuresFailureMechanism_WithForshoreProfiles_ReturnFailureMechanismWithForeshoreProfilesSet() + { + // Setup + var entity = new FailureMechanismEntity + { + CalculationGroupEntity = new CalculationGroupEntity(), + ForeshoreProfileEntities = + { + new ForeshoreProfileEntity + { + Name = "Child1", + GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()), + Order = 1 + }, + new ForeshoreProfileEntity + { + Name = "Child2", + GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()), + Order = 0 + }, + } + }; + var collector = new ReadConversionCollector(); + var failureMechanism = new HeightStructuresFailureMechanism(); + + // Call + entity.ReadAsHeightStructuresFailureMechanism(failureMechanism, collector); + + // Assert + Assert.AreEqual(2, failureMechanism.ForeshoreProfiles.Count); + + ForeshoreProfile child1 = failureMechanism.ForeshoreProfiles[0]; + Assert.AreEqual("Child2", child1.Name); + + ForeshoreProfile child2 = failureMechanism.ForeshoreProfiles[1]; + Assert.AreEqual("Child1", child2.Name); + } + + #endregion + + #region Closing Structures + + [Test] + public void ReadAsClosingStructuresFailureMechanism_WithForshoreProfiles_ReturnFailureMechanismWithForeshoreProfilesSet() + { + // Setup + var entity = new FailureMechanismEntity + { + CalculationGroupEntity = new CalculationGroupEntity(), + ForeshoreProfileEntities = + { + new ForeshoreProfileEntity + { + Name = "Child1", + GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()), + Order = 1 + }, + new ForeshoreProfileEntity + { + Name = "Child2", + GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()), + Order = 0 + }, + } + }; + var collector = new ReadConversionCollector(); + var failureMechanism = new ClosingStructuresFailureMechanism(); + + // Call + entity.ReadAsClosingStructuresFailureMechanism(failureMechanism, collector); + + // Assert + Assert.AreEqual(2, failureMechanism.ForeshoreProfiles.Count); + + ForeshoreProfile child1 = failureMechanism.ForeshoreProfiles[0]; + Assert.AreEqual("Child2", child1.Name); + + ForeshoreProfile child2 = failureMechanism.ForeshoreProfiles[1]; + Assert.AreEqual("Child1", child2.Name); + } + + #endregion + + #region Stability Point Structures + + [Test] + public void ReadAsStabilityPointStructuresFailureMechanism_WithForshoreProfiles_ReturnFailureMechanismWithForeshoreProfilesSet() + { + // Setup + var entity = new FailureMechanismEntity + { + CalculationGroupEntity = new CalculationGroupEntity(), + ForeshoreProfileEntities = + { + new ForeshoreProfileEntity + { + Name = "Child1", + GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()), + Order = 1 + }, + new ForeshoreProfileEntity + { + Name = "Child2", + GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()), + Order = 0 + }, + } + }; + var collector = new ReadConversionCollector(); + var failureMechanism = new StabilityPointStructuresFailureMechanism(); + + // Call + entity.ReadAsStabilityPointStructuresFailureMechanism(failureMechanism, collector); + + // Assert + Assert.AreEqual(2, failureMechanism.ForeshoreProfiles.Count); + + ForeshoreProfile child1 = failureMechanism.ForeshoreProfiles[0]; + Assert.AreEqual("Child2", child1.Name); + + ForeshoreProfile child2 = failureMechanism.ForeshoreProfiles[1]; + Assert.AreEqual("Child1", child2.Name); + } + + #endregion } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Application.Ringtoets.Storage.TestUtil.Test.csproj =================================================================== diff -u -r897606646e4335ec83cefe0a1456a24b5645aefb -rbeb484b744b2d77062ca98ef4ebf7cd32ee5a0cd --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Application.Ringtoets.Storage.TestUtil.Test.csproj (.../Application.Ringtoets.Storage.TestUtil.Test.csproj) (revision 897606646e4335ec83cefe0a1456a24b5645aefb) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Application.Ringtoets.Storage.TestUtil.Test.csproj (.../Application.Ringtoets.Storage.TestUtil.Test.csproj) (revision beb484b744b2d77062ca98ef4ebf7cd32ee5a0cd) @@ -81,6 +81,10 @@ {D749EE4C-CE50-4C17-BF01-9A953028C126} Core.Common.TestUtil + + {c6309704-d67b-434c-bc98-9f8910bc1d10} + Ringtoets.ClosingStructures.Data + {d4200f43-3f72-4f42-af0a-8ced416a38ec} Ringtoets.Common.Data @@ -97,6 +101,10 @@ {e7225477-577f-4a17-b7ec-6721158e1543} Ringtoets.GrassCoverErosionOutwards.Data + + {1c0017d8-35b5-4ca0-8fc7-a83f46dbdc99} + Ringtoets.HeightStructures.Data + {70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2} Ringtoets.HydraRing.Data @@ -117,6 +125,10 @@ {87c2c553-c0bc-40bf-b1ea-b83bff357f27} Ringtoets.Revetment.Data + + {3d4b9740-8348-4434-8d77-b611fc6ee57f} + Ringtoets.StabilityPointStructures.Data + {b479e3af-7c34-488c-bb73-d324100d36c9} Ringtoets.StabilityStoneCover.Data Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs =================================================================== diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -rbeb484b744b2d77062ca98ef4ebf7cd32ee5a0cd --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision 2973c5f790a5131e427bd5f73e2a620044199639) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision beb484b744b2d77062ca98ef4ebf7cd32ee5a0cd) @@ -23,14 +23,17 @@ using Core.Common.Base.Data; using Core.Common.Base.Geometry; using NUnit.Framework; +using Ringtoets.ClosingStructures.Data; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.TestUtil; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionOutwards.Data; +using Ringtoets.HeightStructures.Data; using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Data; using Ringtoets.Piping.Data; using Ringtoets.Piping.Primitives; +using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.WaveImpactAsphaltCover.Data; @@ -192,6 +195,15 @@ Assert.IsTrue(waveImpactAsphaltCoverCalculationWithOutput.HasOutput); Assert.AreEqual(2, waveImpactAsphaltCoverCalculationWithOutput.Output.Items.Count()); Assert.AreEqual(2, waveImpactAsphaltCoverCalculationWithOutput.Output.Items.Count()); + + HeightStructuresFailureMechanism heightStructuresFailureMechanism = assessmentSection.HeightStructures; + Assert.AreEqual(2, heightStructuresFailureMechanism.ForeshoreProfiles.Count); + + ClosingStructuresFailureMechanism closingStructuresFailureMechanism = assessmentSection.ClosingStructures; + Assert.AreEqual(2, closingStructuresFailureMechanism.ForeshoreProfiles.Count); + + StabilityPointStructuresFailureMechanism stabilityPointStructuresFailureMechanism = assessmentSection.StabilityPointStructures; + Assert.AreEqual(2, stabilityPointStructuresFailureMechanism.ForeshoreProfiles.Count); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -rae14c5d4e4624fa87390e6d63bb419c648e12dda -rbeb484b744b2d77062ca98ef4ebf7cd32ee5a0cd --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision ae14c5d4e4624fa87390e6d63bb419c648e12dda) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision beb484b744b2d77062ca98ef4ebf7cd32ee5a0cd) @@ -94,6 +94,21 @@ AddSections(waveImpactAsphaltCoverFailureMechanism); SetSectionResults(waveImpactAsphaltCoverFailureMechanism.SectionResults); + HeightStructuresFailureMechanism heightStructuresFailureMechanism = assessmentSection.HeightStructures; + AddForeshoreProfiles(heightStructuresFailureMechanism.ForeshoreProfiles); + AddSections(heightStructuresFailureMechanism); + SetSectionResults(heightStructuresFailureMechanism.SectionResults); + + ClosingStructuresFailureMechanism closingStructuresFailureMechanism = assessmentSection.ClosingStructures; + AddForeshoreProfiles(closingStructuresFailureMechanism.ForeshoreProfiles); + AddSections(closingStructuresFailureMechanism); + SetSectionResults(closingStructuresFailureMechanism.SectionResults); + + StabilityPointStructuresFailureMechanism stabilityPointStructuresFailureMechanism = assessmentSection.StabilityPointStructures; + AddForeshoreProfiles(stabilityPointStructuresFailureMechanism.ForeshoreProfiles); + AddSections(stabilityPointStructuresFailureMechanism); + SetSectionResults(stabilityPointStructuresFailureMechanism.SectionResults); + AddSections(assessmentSection.MacrostabilityInwards); SetSectionResults(assessmentSection.MacrostabilityInwards.SectionResults); AddSections(assessmentSection.MacrostabilityOutwards); @@ -106,12 +121,6 @@ SetSectionResults(assessmentSection.GrassCoverSlipOffInwards.SectionResults); AddSections(assessmentSection.GrassCoverSlipOffOutwards); SetSectionResults(assessmentSection.GrassCoverSlipOffOutwards.SectionResults); - AddSections(assessmentSection.HeightStructures); - SetSectionResults(assessmentSection.HeightStructures.SectionResults); - AddSections(assessmentSection.ClosingStructures); - SetSectionResults(assessmentSection.ClosingStructures.SectionResults); - AddSections(assessmentSection.StabilityPointStructures); - SetSectionResults(assessmentSection.StabilityPointStructures.SectionResults); AddSections(assessmentSection.StrengthStabilityLengthwiseConstruction); SetSectionResults(assessmentSection.StrengthStabilityLengthwiseConstruction.SectionResults); AddSections(assessmentSection.PipingStructure);