Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs =================================================================== diff -u -r070f77d4fa62658c40449c64eac12a85dc51ea41 -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 070f77d4fa62658c40449c64eac12a85dc51ea41) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -68,12 +68,14 @@ private static void CreateFailureMechanismPlaceHolders(AssessmentSection section, AssessmentSectionEntity entity, CreateConversionCollector collector) { entity.FailureMechanismEntities.Add(section.MacrostabilityInwards.Create(FailureMechanismType.MacrostabilityInwards, collector)); - entity.FailureMechanismEntities.Add(section.Overtopping.Create(FailureMechanismType.StructureHeight, collector)); - entity.FailureMechanismEntities.Add(section.Closing.Create(FailureMechanismType.ReliabilityClosingOfStructure, collector)); - entity.FailureMechanismEntities.Add(section.FailingOfConstruction.Create(FailureMechanismType.StrengthAndStabilityPointConstruction, collector)); - entity.FailureMechanismEntities.Add(section.StoneRevetment.Create(FailureMechanismType.StabilityStoneRevetment, collector)); - entity.FailureMechanismEntities.Add(section.AsphaltRevetment.Create(FailureMechanismType.WaveImpactOnAsphaltRevetment, collector)); - entity.FailureMechanismEntities.Add(section.GrassRevetment.Create(FailureMechanismType.GrassRevetmentErosionOutwards, collector)); + entity.FailureMechanismEntities.Add(section.StabilityStoneCover.Create(FailureMechanismType.StabilityStoneRevetment, collector)); + entity.FailureMechanismEntities.Add(section.WaveImpactAsphaltCover.Create(FailureMechanismType.WaveImpactOnAsphaltRevetment, collector)); + entity.FailureMechanismEntities.Add(section.GrassCoverErosionOutside.Create(FailureMechanismType.GrassRevetmentErosionOutwards, collector)); + entity.FailureMechanismEntities.Add(section.GrassCoverSlipOffOutside.Create(FailureMechanismType.GrassRevetmentSlidingOutwards, collector)); + entity.FailureMechanismEntities.Add(section.HeightStructure.Create(FailureMechanismType.StructureHeight, collector)); + entity.FailureMechanismEntities.Add(section.ClosingStructure.Create(FailureMechanismType.ReliabilityClosingOfStructure, collector)); + entity.FailureMechanismEntities.Add(section.PipingStructure.Create(FailureMechanismType.PipingAtStructure, collector)); + entity.FailureMechanismEntities.Add(section.StrengthStabilityPointConstruction.Create(FailureMechanismType.StrengthAndStabilityPointConstruction, collector)); entity.FailureMechanismEntities.Add(section.DuneErosion.Create(FailureMechanismType.DuneErosion, collector)); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntity.cs =================================================================== diff -u -r070f77d4fa62658c40449c64eac12a85dc51ea41 -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntity.cs (.../AssessmentSectionEntity.cs) (revision 070f77d4fa62658c40449c64eac12a85dc51ea41) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntity.cs (.../AssessmentSectionEntity.cs) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -128,12 +128,14 @@ private void ReadFailureMechanismPlaceholders(AssessmentSection assessmentSection) { ReadFailureMechanismPlaceholder(FailureMechanismType.MacrostabilityInwards, assessmentSection.MacrostabilityInwards); - ReadFailureMechanismPlaceholder(FailureMechanismType.StructureHeight, assessmentSection.Overtopping); - ReadFailureMechanismPlaceholder(FailureMechanismType.ReliabilityClosingOfStructure, assessmentSection.Closing); - ReadFailureMechanismPlaceholder(FailureMechanismType.StrengthAndStabilityPointConstruction, assessmentSection.FailingOfConstruction); - ReadFailureMechanismPlaceholder(FailureMechanismType.StabilityStoneRevetment, assessmentSection.StoneRevetment); - ReadFailureMechanismPlaceholder(FailureMechanismType.WaveImpactOnAsphaltRevetment, assessmentSection.AsphaltRevetment); - ReadFailureMechanismPlaceholder(FailureMechanismType.GrassRevetmentErosionOutwards, assessmentSection.GrassRevetment); + ReadFailureMechanismPlaceholder(FailureMechanismType.StabilityStoneRevetment, assessmentSection.StabilityStoneCover); + ReadFailureMechanismPlaceholder(FailureMechanismType.WaveImpactOnAsphaltRevetment, assessmentSection.WaveImpactAsphaltCover); + ReadFailureMechanismPlaceholder(FailureMechanismType.GrassRevetmentErosionOutwards, assessmentSection.GrassCoverErosionOutside); + ReadFailureMechanismPlaceholder(FailureMechanismType.GrassRevetmentSlidingOutwards, assessmentSection.GrassCoverSlipOffOutside); + ReadFailureMechanismPlaceholder(FailureMechanismType.StructureHeight, assessmentSection.HeightStructure); + ReadFailureMechanismPlaceholder(FailureMechanismType.ReliabilityClosingOfStructure, assessmentSection.ClosingStructure); + ReadFailureMechanismPlaceholder(FailureMechanismType.PipingAtStructure, assessmentSection.PipingStructure); + ReadFailureMechanismPlaceholder(FailureMechanismType.StrengthAndStabilityPointConstruction, assessmentSection.StrengthStabilityPointConstruction); ReadFailureMechanismPlaceholder(FailureMechanismType.DuneErosion, assessmentSection.DuneErosion); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs =================================================================== diff -u -r070f77d4fa62658c40449c64eac12a85dc51ea41 -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs (.../AssessmentSectionUpdateExtensions.cs) (revision 070f77d4fa62658c40449c64eac12a85dc51ea41) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs (.../AssessmentSectionUpdateExtensions.cs) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -74,12 +74,14 @@ private static void UpdateFailureMechanismPlaceHolders(AssessmentSection section, UpdateConversionCollector collector, IRingtoetsEntities context) { section.MacrostabilityInwards.Update(collector, context); - section.Overtopping.Update(collector, context); - section.Closing.Update(collector, context); - section.FailingOfConstruction.Update(collector, context); - section.StoneRevetment.Update(collector, context); - section.AsphaltRevetment.Update(collector, context); - section.GrassRevetment.Update(collector, context); + section.StabilityStoneCover.Update(collector, context); + section.WaveImpactAsphaltCover.Update(collector, context); + section.GrassCoverErosionOutside.Update(collector, context); + section.GrassCoverSlipOffOutside.Update(collector, context); + section.HeightStructure.Update(collector, context); + section.ClosingStructure.Update(collector, context); + section.PipingStructure.Update(collector, context); + section.StrengthStabilityPointConstruction.Update(collector, context); section.DuneErosion.Update(collector, context); } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs =================================================================== diff -u -r070f77d4fa62658c40449c64eac12a85dc51ea41 -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision 070f77d4fa62658c40449c64eac12a85dc51ea41) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -72,16 +72,18 @@ Assert.IsNotNull(entity); Assert.AreEqual((short)assessmentSectionComposition, entity.Composition); Assert.AreEqual(testName, entity.Name); - Assert.AreEqual(10, entity.FailureMechanismEntities.Count); + Assert.AreEqual(12, entity.FailureMechanismEntities.Count); Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.Piping)); Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.GrassRevetmentTopErosionAndInwards)); Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.MacrostabilityInwards)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.StructureHeight)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.ReliabilityClosingOfStructure)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.StrengthAndStabilityPointConstruction)); Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.StabilityStoneRevetment)); Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.WaveImpactOnAsphaltRevetment)); Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.GrassRevetmentErosionOutwards)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.GrassRevetmentSlidingOutwards)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.StructureHeight)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.ReliabilityClosingOfStructure)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.PipingAtStructure)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.StrengthAndStabilityPointConstruction)); Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.DuneErosion)); Assert.IsNull(entity.HydraulicDatabaseLocation); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityTest.cs =================================================================== diff -u -r070f77d4fa62658c40449c64eac12a85dc51ea41 -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityTest.cs (.../AssessmentSectionEntityTest.cs) (revision 070f77d4fa62658c40449c64eac12a85dc51ea41) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityTest.cs (.../AssessmentSectionEntityTest.cs) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -301,29 +301,29 @@ Assert.AreEqual(isRelevant, section.MacrostabilityInwards.IsRelevant); Assert.AreEqual(2, section.MacrostabilityInwards.Sections.Count()); - Assert.AreEqual(overtoppingEntityId, section.Overtopping.StorageId); - Assert.AreEqual(isRelevant, section.Overtopping.IsRelevant); - Assert.AreEqual(2, section.Overtopping.Sections.Count()); + Assert.AreEqual(overtoppingEntityId, section.HeightStructure.StorageId); + Assert.AreEqual(isRelevant, section.HeightStructure.IsRelevant); + Assert.AreEqual(2, section.HeightStructure.Sections.Count()); - Assert.AreEqual(closingEntityId, section.Closing.StorageId); - Assert.AreEqual(isRelevant, section.Closing.IsRelevant); - Assert.AreEqual(2, section.Closing.Sections.Count()); + Assert.AreEqual(closingEntityId, section.ClosingStructure.StorageId); + Assert.AreEqual(isRelevant, section.ClosingStructure.IsRelevant); + Assert.AreEqual(2, section.ClosingStructure.Sections.Count()); - Assert.AreEqual(failingOfConstructionEntityId, section.FailingOfConstruction.StorageId); - Assert.AreEqual(isRelevant, section.FailingOfConstruction.IsRelevant); - Assert.AreEqual(2, section.FailingOfConstruction.Sections.Count()); + Assert.AreEqual(failingOfConstructionEntityId, section.StrengthStabilityPointConstruction.StorageId); + Assert.AreEqual(isRelevant, section.StrengthStabilityPointConstruction.IsRelevant); + Assert.AreEqual(2, section.StrengthStabilityPointConstruction.Sections.Count()); - Assert.AreEqual(stoneRevetmentEntityId, section.StoneRevetment.StorageId); - Assert.AreEqual(isRelevant, section.StoneRevetment.IsRelevant); - Assert.AreEqual(2, section.StoneRevetment.Sections.Count()); + Assert.AreEqual(stoneRevetmentEntityId, section.StabilityStoneCover.StorageId); + Assert.AreEqual(isRelevant, section.StabilityStoneCover.IsRelevant); + Assert.AreEqual(2, section.StabilityStoneCover.Sections.Count()); - Assert.AreEqual(asphaltRevetmentEntityId, section.AsphaltRevetment.StorageId); - Assert.AreEqual(isRelevant, section.AsphaltRevetment.IsRelevant); - Assert.AreEqual(2, section.AsphaltRevetment.Sections.Count()); + Assert.AreEqual(asphaltRevetmentEntityId, section.WaveImpactAsphaltCover.StorageId); + Assert.AreEqual(isRelevant, section.WaveImpactAsphaltCover.IsRelevant); + Assert.AreEqual(2, section.WaveImpactAsphaltCover.Sections.Count()); - Assert.AreEqual(grassRevetmentEntityId, section.GrassRevetment.StorageId); - Assert.AreEqual(isRelevant, section.GrassRevetment.IsRelevant); - Assert.AreEqual(2, section.GrassRevetment.Sections.Count()); + Assert.AreEqual(grassRevetmentEntityId, section.GrassCoverErosionOutside.StorageId); + Assert.AreEqual(isRelevant, section.GrassCoverErosionOutside.IsRelevant); + Assert.AreEqual(2, section.GrassCoverErosionOutside.Sections.Count()); Assert.AreEqual(duneErosionEntityId, section.DuneErosion.StorageId); Assert.AreEqual(isRelevant, section.DuneErosion.IsRelevant); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs =================================================================== diff -u -r070f77d4fa62658c40449c64eac12a85dc51ea41 -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs (.../AssessmentSectionUpdateExtensionsTest.cs) (revision 070f77d4fa62658c40449c64eac12a85dc51ea41) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs (.../AssessmentSectionUpdateExtensionsTest.cs) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -434,24 +434,24 @@ section.MacrostabilityInwards.StorageId = 1; section.MacrostabilityInwards.Contribution = 0.5; section.MacrostabilityInwards.IsRelevant = true; - section.Overtopping.StorageId = 2; - section.Overtopping.Contribution = 0.5; - section.Overtopping.IsRelevant = true; - section.Closing.StorageId = 3; - section.Closing.Contribution = 0.5; - section.Closing.IsRelevant = true; - section.FailingOfConstruction.StorageId = 4; - section.FailingOfConstruction.Contribution = 0.5; - section.FailingOfConstruction.IsRelevant = true; - section.StoneRevetment.StorageId = 5; - section.StoneRevetment.Contribution = 0.5; - section.StoneRevetment.IsRelevant = true; - section.AsphaltRevetment.StorageId = 6; - section.AsphaltRevetment.Contribution = 0.5; - section.AsphaltRevetment.IsRelevant = true; - section.GrassRevetment.StorageId = 7; - section.GrassRevetment.Contribution = 0.5; - section.GrassRevetment.IsRelevant = true; + section.HeightStructure.StorageId = 2; + section.HeightStructure.Contribution = 0.5; + section.HeightStructure.IsRelevant = true; + section.ClosingStructure.StorageId = 3; + section.ClosingStructure.Contribution = 0.5; + section.ClosingStructure.IsRelevant = true; + section.StrengthStabilityPointConstruction.StorageId = 4; + section.StrengthStabilityPointConstruction.Contribution = 0.5; + section.StrengthStabilityPointConstruction.IsRelevant = true; + section.StabilityStoneCover.StorageId = 5; + section.StabilityStoneCover.Contribution = 0.5; + section.StabilityStoneCover.IsRelevant = true; + section.WaveImpactAsphaltCover.StorageId = 6; + section.WaveImpactAsphaltCover.Contribution = 0.5; + section.WaveImpactAsphaltCover.IsRelevant = true; + section.GrassCoverErosionOutside.StorageId = 7; + section.GrassCoverErosionOutside.Contribution = 0.5; + section.GrassCoverErosionOutside.IsRelevant = true; section.DuneErosion.StorageId = 8; section.DuneErosion.Contribution = 0.5; section.DuneErosion.IsRelevant = true; @@ -558,33 +558,41 @@ { StorageId = 3 }, - Overtopping = + HeightStructure = { StorageId = 4 }, - Closing = + ClosingStructure = { StorageId = 5 }, - FailingOfConstruction = + StrengthStabilityPointConstruction = { StorageId = 6 }, - StoneRevetment = + StabilityStoneCover = { StorageId = 7 }, - AsphaltRevetment = + WaveImpactAsphaltCover = { StorageId = 8 }, - GrassRevetment = + GrassCoverErosionOutside = { StorageId = 9 }, - DuneErosion = + GrassCoverSlipOffOutside = { StorageId = 10 + }, + PipingStructure = + { + StorageId = 11 + }, + DuneErosion = + { + StorageId = 12 } }; } @@ -599,7 +607,7 @@ } var count = failureMechanismEntities.Count(); - for (var i = 1; i <= 10 - count; i++) + for (var i = 1; i <= 12 - count; i++) { failureMechanismEntities.Add(new FailureMechanismEntity { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/ProjectUpdateExtensionsTest.cs =================================================================== diff -u -r070f77d4fa62658c40449c64eac12a85dc51ea41 -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/ProjectUpdateExtensionsTest.cs (.../ProjectUpdateExtensionsTest.cs) (revision 070f77d4fa62658c40449c64eac12a85dc51ea41) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/ProjectUpdateExtensionsTest.cs (.../ProjectUpdateExtensionsTest.cs) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -256,30 +256,38 @@ { StorageId = 1 }, - Overtopping = + HeightStructure = { StorageId = 1 }, - Closing = + ClosingStructure = { StorageId = 1 }, - FailingOfConstruction = + StrengthStabilityPointConstruction = { StorageId = 1 }, - StoneRevetment = + StabilityStoneCover = { StorageId = 1 }, - AsphaltRevetment = + WaveImpactAsphaltCover = { StorageId = 1 }, - GrassRevetment = + GrassCoverErosionOutside = { StorageId = 1 }, + GrassCoverSlipOffOutside = + { + StorageId = 1 + }, + PipingStructure = + { + StorageId = 1 + }, DuneErosion = { StorageId = 1 Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r88e4b60f9055cf9153fc5c7b618537accfc3f3fa -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 88e4b60f9055cf9153fc5c7b618537accfc3f3fa) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -115,7 +115,7 @@ } /// - /// Looks up a localized string similar to Dijken - Grasbekleding erosie kruin en binnentalud. + /// Looks up a localized string similar to Dijken en dammen - Grasbekleding erosie kruin en binnentalud. /// public static string GrassCoverErosionInwardsFailureMechanism_DisplayName { get { Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.resx =================================================================== diff -u -r88e4b60f9055cf9153fc5c7b618537accfc3f3fa -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.resx (.../Resources.resx) (revision 88e4b60f9055cf9153fc5c7b618537accfc3f3fa) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.resx (.../Resources.resx) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - Dijken - Grasbekleding erosie kruin en binnentalud + Dijken en dammen - Grasbekleding erosie kruin en binnentalud Nieuwe berekening Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r330586b375b0f21f7aa9f650827ffe29572a2f03 -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 330586b375b0f21f7aa9f650827ffe29572a2f03) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -93,7 +93,7 @@ var text = info.Text(mechanismContext); // Assert - const string expectedName = "Dijken - Grasbekleding erosie kruin en binnentalud"; + const string expectedName = "Dijken en dammen - Grasbekleding erosie kruin en binnentalud"; Assert.AreEqual(expectedName, text); mocksRepository.VerifyAll(); } Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs =================================================================== diff -u -rc5f90c4f9b42d985f16f99ad8732576b9217267a -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -54,67 +54,80 @@ PipingFailureMechanism = new PipingFailureMechanism(); GrassCoverErosionInwards = new GrassCoverErosionInwardsFailureMechanism(); - MacrostabilityInwards = new FailureMechanismPlaceholder(Resources.MacrostabilityInwardFailureMechanism_DisplayName); - Overtopping = new FailureMechanismPlaceholder(Resources.OvertoppingFailureMechanism_DisplayName); - Closing = new FailureMechanismPlaceholder(Resources.ClosingFailureMechanism_DisplayName); - FailingOfConstruction = new FailureMechanismPlaceholder(Resources.FailingOfConstructionFailureMechanism_DisplayName); - StoneRevetment = new FailureMechanismPlaceholder(Resources.StoneRevetmentFailureMechanism_DisplayName); - AsphaltRevetment = new FailureMechanismPlaceholder(Resources.AsphaltRevetmentFailureMechanism_DisplayName); - GrassRevetment = new FailureMechanismPlaceholder(Resources.GrassRevetmentFailureMechanism_DisplayName); - DuneErosion = new FailureMechanismPlaceholder(Resources.ErosionFailureMechanism_DisplayName); + MacrostabilityInwards = new FailureMechanismPlaceholder(Resources.MacrostabilityInwardFailureMechanism_DisplayName); + StabilityStoneCover = new FailureMechanismPlaceholder(Resources.StabilityStoneCoverFailureMechanism_DisplayName); + WaveImpactAsphaltCover = new FailureMechanismPlaceholder(Resources.WaveImpactAsphaltCoverFailureMechanism_DisplayName); + GrassCoverErosionOutside = new FailureMechanismPlaceholder(Resources.GrassCoverErosionOutsideFailureMechanism_DisplayName); + GrassCoverSlipOffOutside = new FailureMechanismPlaceholder(Resources.GrassCoverSlipOffOutsideFailureMechanism_DisplayName); + HeightStructure = new FailureMechanismPlaceholder(Resources.HeightStructureFailureMechanism_DisplayName); + ClosingStructure = new FailureMechanismPlaceholder(Resources.ClosingStructureFailureMechanism_DisplayName); + StrengthStabilityPointConstruction = new FailureMechanismPlaceholder(Resources.StrengthStabilityPointConstructionFailureMechanism_DisplayName); + PipingStructure = new FailureMechanismPlaceholder(Resources.PipingStructureFailureMechanism_DisplayName); + DuneErosion = new FailureMechanismPlaceholder(Resources.DuneErosionFailureMechanism_DisplayName); + FailureMechanismContribution = new FailureMechanismContribution(GetFailureMechanisms(), 30, 30000); ChangeComposition(composition); } - + /// - /// Gets the "Dijken - Piping" failure mechanism. + /// Gets the "Dijken en dammen - Piping" failure mechanism. /// public PipingFailureMechanism PipingFailureMechanism { get; private set; } /// - /// Gets the "Dijken - Grasbekleding erosie kruin en binnentalud" failure mechanism. + /// Gets the "Dijken en dammen - Grasbekleding erosie kruin en binnentalud" failure mechanism. /// public GrassCoverErosionInwardsFailureMechanism GrassCoverErosionInwards { get; private set; } /// - /// Gets the "Dijken - Macrostabiliteit binnenwaarts" failure mechanism. + /// Gets the "Dijken en dammen - Macrostabiliteit binnenwaarts" failure mechanism. /// public FailureMechanismPlaceholder MacrostabilityInwards { get; private set; } /// - /// Gets the "Overslag en overloop" failure mechanism. + /// Gets the "Dijken en dammen - Stabiliteit steenzetting" failure mechanism. /// - public FailureMechanismPlaceholder Overtopping { get; private set; } + public FailureMechanismPlaceholder StabilityStoneCover { get; private set; } /// - /// Gets the "Niet sluiten" failure mechanism. + /// Gets the "Dijken en dammen - Golfklappen op asfaltbekledingen" failure mechanism. /// - public FailureMechanismPlaceholder Closing { get; private set; } + public FailureMechanismPlaceholder WaveImpactAsphaltCover { get; private set; } /// - /// Gets the "Constructief falen" failure mechanism. + /// Gets the "Dijken en dammen - Grasbekleding erosie buitentalud" failure mechanism. /// - public FailureMechanismPlaceholder FailingOfConstruction { get; private set; } + public FailureMechanismPlaceholder GrassCoverErosionOutside { get; private set; } /// - /// Gets the "Steenbekledingen" failure mechanism. + /// Gets the "Dijken en dammen - Grasbekleding afschuiven buitentalud" failure mechanism. /// - public FailureMechanismPlaceholder StoneRevetment { get; private set; } + public FailureMechanismPlaceholder GrassCoverSlipOffOutside { get; set; } /// - /// Gets the "Asfaltbekledingen" failure mechanism. + /// Gets the "Kunstwerken - Hoogte kunstwerk" failure mechanism. /// - public FailureMechanismPlaceholder AsphaltRevetment { get; private set; } + public FailureMechanismPlaceholder HeightStructure { get; private set; } /// - /// Gets the "Grasbekledingen" failure mechanism. + /// Gets the "Kunstwerken - Betrouwbaarheid sluiting kunstwerk" failure mechanism. /// - public FailureMechanismPlaceholder GrassRevetment { get; private set; } + public FailureMechanismPlaceholder ClosingStructure { get; private set; } /// - /// Gets the "Duinerosie" failure mechanism. + /// Gets the "Kunstwerken - Piping bij kunstwerk" failure mechanism. /// + public FailureMechanismPlaceholder PipingStructure { get; set; } + + /// + /// Gets the "Kunstwerken - Sterkte en stabiliteit puntconstructies" failure mechanism. + /// + public FailureMechanismPlaceholder StrengthStabilityPointConstruction { get; private set; } + + /// + /// Gets the "Duinwaterkering - Duinafslag" failure mechanism. + /// public FailureMechanismPlaceholder DuneErosion { get; private set; } public string Name { get; set; } @@ -158,12 +171,14 @@ yield return PipingFailureMechanism; yield return GrassCoverErosionInwards; yield return MacrostabilityInwards; - yield return Overtopping; - yield return Closing; - yield return FailingOfConstruction; - yield return StoneRevetment; - yield return AsphaltRevetment; - yield return GrassRevetment; + yield return StabilityStoneCover; + yield return WaveImpactAsphaltCover; + yield return GrassCoverErosionOutside; + yield return GrassCoverSlipOffOutside; + yield return HeightStructure; + yield return ClosingStructure; + yield return PipingStructure; + yield return StrengthStabilityPointConstruction; yield return DuneErosion; } @@ -175,38 +190,44 @@ PipingFailureMechanism.Contribution = 24; GrassCoverErosionInwards.Contribution = 24; MacrostabilityInwards.Contribution = 4; - Overtopping.Contribution = 2; - Closing.Contribution = 4; - FailingOfConstruction.Contribution = 2; - StoneRevetment.Contribution = 4; - AsphaltRevetment.Contribution = 3; - GrassRevetment.Contribution = 3; + StabilityStoneCover.Contribution = 3; + WaveImpactAsphaltCover.Contribution = 1; + GrassCoverErosionOutside.Contribution = 5; + GrassCoverSlipOffOutside.Contribution = 1; + HeightStructure.Contribution = 24; + ClosingStructure.Contribution = 4; + PipingStructure.Contribution = 2; + StrengthStabilityPointConstruction.Contribution = 2; DuneErosion.Contribution = 0; FailureMechanismContribution.UpdateContributions(GetFailureMechanisms(), 30); break; case AssessmentSectionComposition.Dune: PipingFailureMechanism.Contribution = 0; GrassCoverErosionInwards.Contribution = 0; MacrostabilityInwards.Contribution = 0; - Overtopping.Contribution = 0; - Closing.Contribution = 0; - FailingOfConstruction.Contribution = 0; - StoneRevetment.Contribution = 0; - AsphaltRevetment.Contribution = 0; - GrassRevetment.Contribution = 0; + StabilityStoneCover.Contribution = 0; + WaveImpactAsphaltCover.Contribution = 0; + GrassCoverErosionOutside.Contribution = 0; + GrassCoverSlipOffOutside.Contribution = 0; + HeightStructure.Contribution = 0; + ClosingStructure.Contribution = 0; + PipingStructure.Contribution = 0; + StrengthStabilityPointConstruction.Contribution = 0; DuneErosion.Contribution = 70; FailureMechanismContribution.UpdateContributions(GetFailureMechanisms(), 30); break; case AssessmentSectionComposition.DikeAndDune: PipingFailureMechanism.Contribution = 24; GrassCoverErosionInwards.Contribution = 24; MacrostabilityInwards.Contribution = 4; - Overtopping.Contribution = 2; - Closing.Contribution = 4; - FailingOfConstruction.Contribution = 2; - StoneRevetment.Contribution = 4; - AsphaltRevetment.Contribution = 3; - GrassRevetment.Contribution = 3; + StabilityStoneCover.Contribution = 3; + WaveImpactAsphaltCover.Contribution = 1; + GrassCoverErosionOutside.Contribution = 5; + GrassCoverSlipOffOutside.Contribution = 1; + HeightStructure.Contribution = 24; + ClosingStructure.Contribution = 4; + PipingStructure.Contribution = 2; + StrengthStabilityPointConstruction.Contribution = 2; DuneErosion.Contribution = 10; FailureMechanismContribution.UpdateContributions(GetFailureMechanisms(), 20); break; Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs =================================================================== diff -u -rb28f56d6bb3f14141bd003dd43378f8002a9e87a -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b28f56d6bb3f14141bd003dd43378f8002a9e87a) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -61,65 +61,65 @@ } /// - /// Looks up a localized string similar to Dijken - Asfaltbekledingen. + /// Looks up a localized string similar to Traject. /// - public static string AsphaltRevetmentFailureMechanism_DisplayName { + public static string AssessmentSection_DisplayName { get { - return ResourceManager.GetString("AsphaltRevetmentFailureMechanism_DisplayName", resourceCulture); + return ResourceManager.GetString("AssessmentSection_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to Traject. + /// Looks up a localized string similar to Kunstwerken - Betrouwbaarheid sluiting kunstwerk. /// - public static string AssessmentSection_DisplayName { + public static string ClosingStructureFailureMechanism_DisplayName { get { - return ResourceManager.GetString("AssessmentSection_DisplayName", resourceCulture); + return ResourceManager.GetString("ClosingStructureFailureMechanism_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to Kunstwerken - Niet sluiten. + /// Looks up a localized string similar to Duinwaterkering - Duinafslag. /// - public static string ClosingFailureMechanism_DisplayName { + public static string DuneErosionFailureMechanism_DisplayName { get { - return ResourceManager.GetString("ClosingFailureMechanism_DisplayName", resourceCulture); + return ResourceManager.GetString("DuneErosionFailureMechanism_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to Duinen - Erosie. + /// Looks up a localized string similar to Faalkansverdeling. /// - public static string ErosionFailureMechanism_DisplayName { + public static string FailureMechanismContribution_DisplayName { get { - return ResourceManager.GetString("ErosionFailureMechanism_DisplayName", resourceCulture); + return ResourceManager.GetString("FailureMechanismContribution_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to Kunstwerken - Constructief falen. + /// Looks up a localized string similar to Dijken en dammen - Grasbekleding erosie buitentalud. /// - public static string FailingOfConstructionFailureMechanism_DisplayName { + public static string GrassCoverErosionOutsideFailureMechanism_DisplayName { get { - return ResourceManager.GetString("FailingOfConstructionFailureMechanism_DisplayName", resourceCulture); + return ResourceManager.GetString("GrassCoverErosionOutsideFailureMechanism_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to Faalkansverdeling. + /// Looks up a localized string similar to Dijken en dammen - Grasbekleding afschuiven buitentalud. /// - public static string FailureMechanismContribution_DisplayName { + public static string GrassCoverSlipOffOutsideFailureMechanism_DisplayName { get { - return ResourceManager.GetString("FailureMechanismContribution_DisplayName", resourceCulture); + return ResourceManager.GetString("GrassCoverSlipOffOutsideFailureMechanism_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to Dijken - Grasbekledingen. + /// Looks up a localized string similar to Kunstwerken - Hoogte kunstwerk. /// - public static string GrassRevetmentFailureMechanism_DisplayName { + public static string HeightStructureFailureMechanism_DisplayName { get { - return ResourceManager.GetString("GrassRevetmentFailureMechanism_DisplayName", resourceCulture); + return ResourceManager.GetString("HeightStructureFailureMechanism_DisplayName", resourceCulture); } } @@ -133,7 +133,7 @@ } /// - /// Looks up a localized string similar to Dijken - Macrostabiliteit binnenwaarts. + /// Looks up a localized string similar to Dijken en dammen - Macrostabiliteit binnenwaarts. /// public static string MacrostabilityInwardFailureMechanism_DisplayName { get { @@ -142,21 +142,39 @@ } /// - /// Looks up a localized string similar to Kunstwerken - Overslag en overloop. + /// Looks up a localized string similar to Kunstwerken - Piping bij kunstwerk. /// - public static string OvertoppingFailureMechanism_DisplayName { + public static string PipingStructureFailureMechanism_DisplayName { get { - return ResourceManager.GetString("OvertoppingFailureMechanism_DisplayName", resourceCulture); + return ResourceManager.GetString("PipingStructureFailureMechanism_DisplayName", resourceCulture); } } /// - /// Looks up a localized string similar to Dijken - Steenbekledingen. + /// Looks up a localized string similar to Dijken en dammen - Stabiliteit steenzetting. /// - public static string StoneRevetmentFailureMechanism_DisplayName { + public static string StabilityStoneCoverFailureMechanism_DisplayName { get { - return ResourceManager.GetString("StoneRevetmentFailureMechanism_DisplayName", resourceCulture); + return ResourceManager.GetString("StabilityStoneCoverFailureMechanism_DisplayName", resourceCulture); } } + + /// + /// Looks up a localized string similar to Kunstwerken - Sterkte en stabiliteit puntconstructies. + /// + public static string StrengthStabilityPointConstructionFailureMechanism_DisplayName { + get { + return ResourceManager.GetString("StrengthStabilityPointConstructionFailureMechanism_DisplayName", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Dijken en dammen - Golfklappen op asfaltbekledingen. + /// + public static string WaveImpactAsphaltCoverFailureMechanism_DisplayName { + get { + return ResourceManager.GetString("WaveImpactAsphaltCoverFailureMechanism_DisplayName", resourceCulture); + } + } } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx =================================================================== diff -u -rb28f56d6bb3f14141bd003dd43378f8002a9e87a -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision b28f56d6bb3f14141bd003dd43378f8002a9e87a) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -123,31 +123,37 @@ Hydraulische randvoorwaarden - - Duinen - Erosie + + Duinwaterkering - Duinafslag Traject - Dijken - Macrostabiliteit binnenwaarts + Dijken en dammen - Macrostabiliteit binnenwaarts - - Kunstwerken - Overslag en overloop + + Kunstwerken - Hoogte kunstwerk - - Kunstwerken - Niet sluiten + + Kunstwerken - Sterkte en stabiliteit puntconstructies - - Kunstwerken - Constructief falen + + Dijken en dammen - Golfklappen op asfaltbekledingen - - Dijken - Steenbekledingen + + Dijken en dammen - Grasbekleding erosie buitentalud - - Dijken - Asfaltbekledingen + + Kunstwerken - Betrouwbaarheid sluiting kunstwerk - - Dijken - Grasbekledingen + + Dijken en dammen - Grasbekleding afschuiven buitentalud + + Kunstwerken - Piping bij kunstwerk + + + Dijken en dammen - Stabiliteit steenzetting + \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs =================================================================== diff -u -rc5f90c4f9b42d985f16f99ad8732576b9217267a -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/AssessmentSectionTest.cs (.../AssessmentSectionTest.cs) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -37,36 +37,40 @@ public class AssessmentSectionTest { [Test] - [TestCase(AssessmentSectionComposition.Dike)] - [TestCase(AssessmentSectionComposition.Dune)] - [TestCase(AssessmentSectionComposition.DikeAndDune)] - public void Constructor_ExpectedValues(AssessmentSectionComposition composition) + [TestCase(AssessmentSectionComposition.Dike, 124)] + [TestCase(AssessmentSectionComposition.Dune, 100)] + [TestCase(AssessmentSectionComposition.DikeAndDune, 124)] + public void Constructor_ExpectedValues(AssessmentSectionComposition composition, int sum) { // Call var section = new AssessmentSection(composition); - var pipingName = "Dijken - Piping"; - var grassErosionName = "Dijken - Grasbekleding erosie kruin en binnentalud"; - var macrostailityInwardName = "Dijken - Macrostabiliteit binnenwaarts"; - var overtoppingName = "Kunstwerken - Overslag en overloop"; - var closingName = "Kunstwerken - Niet sluiten"; - var failingOfConstructionName = "Kunstwerken - Constructief falen"; - var stoneRevetmentName = "Dijken - Steenbekledingen"; - var asphaltName = "Dijken - Asfaltbekledingen"; - var grassRevetmentName = "Dijken - Grasbekledingen"; - var duneErosionName = "Duinen - Erosie"; + var pipingName = "Dijken en dammen - Piping"; + var grassErosionInsideName = "Dijken en dammen - Grasbekleding erosie kruin en binnentalud"; + var macrostabilityInwardName = "Dijken en dammen - Macrostabiliteit binnenwaarts"; + var stoneRevetmentName = "Dijken en dammen - Stabiliteit steenzetting"; + var waveImpactAsphalt = "Dijken en dammen - Golfklappen op asfaltbekledingen"; + var grassCoverErosionOutwardsName = "Dijken en dammen - Grasbekleding erosie buitentalud"; + var grassCoverSlipOffOutsideName = "Dijken en dammen - Grasbekleding afschuiven buitentalud"; + var heightStructureName = "Kunstwerken - Hoogte kunstwerk"; + var closingStructureName = "Kunstwerken - Betrouwbaarheid sluiting kunstwerk"; + var pipingStructureName = "Kunstwerken - Piping bij kunstwerk"; + var strengthStabilityPointConstructionName = "Kunstwerken - Sterkte en stabiliteit puntconstructies"; + var duneErosionName = "Duinwaterkering - Duinafslag"; var names = new[] { pipingName, - grassErosionName, - macrostailityInwardName, - overtoppingName, - closingName, - failingOfConstructionName, + grassErosionInsideName, + macrostabilityInwardName, stoneRevetmentName, - asphaltName, - grassRevetmentName, + waveImpactAsphalt, + grassCoverErosionOutwardsName, + grassCoverSlipOffOutsideName, + heightStructureName, + closingStructureName, + pipingStructureName, + strengthStabilityPointConstructionName, duneErosionName, "Overig" }; @@ -87,24 +91,26 @@ Assert.IsInstanceOf(section.PipingFailureMechanism); Assert.IsInstanceOf(section.GrassCoverErosionInwards); - Assert.AreEqual(macrostailityInwardName, section.MacrostabilityInwards.Name); - Assert.AreEqual(overtoppingName, section.Overtopping.Name); - Assert.AreEqual(closingName, section.Closing.Name); - Assert.AreEqual(failingOfConstructionName, section.FailingOfConstruction.Name); - Assert.AreEqual(stoneRevetmentName, section.StoneRevetment.Name); - Assert.AreEqual(asphaltName, section.AsphaltRevetment.Name); - Assert.AreEqual(grassRevetmentName, section.GrassRevetment.Name); + Assert.AreEqual(macrostabilityInwardName, section.MacrostabilityInwards.Name); + Assert.AreEqual(stoneRevetmentName, section.StabilityStoneCover.Name); + Assert.AreEqual(waveImpactAsphalt, section.WaveImpactAsphaltCover.Name); + Assert.AreEqual(grassCoverErosionOutwardsName, section.GrassCoverErosionOutside.Name); + Assert.AreEqual(grassCoverSlipOffOutsideName, section.GrassCoverSlipOffOutside.Name); + Assert.AreEqual(heightStructureName, section.HeightStructure.Name); + Assert.AreEqual(closingStructureName, section.ClosingStructure.Name); + Assert.AreEqual(pipingStructureName, section.PipingStructure.Name); + Assert.AreEqual(strengthStabilityPointConstructionName, section.StrengthStabilityPointConstruction.Name); Assert.AreEqual(duneErosionName, section.DuneErosion.Name); AssertExpectedContributions(composition, section); Assert.AreEqual(names, section.FailureMechanismContribution.Distribution.Select(d => d.Assessment)); - Assert.AreEqual(Enumerable.Repeat(30000.0, 11), section.FailureMechanismContribution.Distribution.Select(d => d.Norm)); + Assert.AreEqual(Enumerable.Repeat(30000.0, 13), section.FailureMechanismContribution.Distribution.Select(d => d.Norm)); Assert.AreEqual(30000.0, section.PipingFailureMechanism.NormProbabilityInput.Norm); Assert.AreEqual(double.NaN, section.PipingFailureMechanism.NormProbabilityInput.SectionLength); - Assert.AreEqual(100, section.FailureMechanismContribution.Distribution.Sum(d => d.Contribution)); + Assert.AreEqual(sum, section.FailureMechanismContribution.Distribution.Sum(d => d.Contribution)); } [Test] @@ -148,17 +154,19 @@ var failureMechanisms = assessmentSection.GetFailureMechanisms().ToArray(); // Assert - Assert.AreEqual(10, failureMechanisms.Length); + Assert.AreEqual(12, failureMechanisms.Length); Assert.AreSame(assessmentSection.PipingFailureMechanism, failureMechanisms[0]); Assert.AreSame(assessmentSection.GrassCoverErosionInwards, failureMechanisms[1]); Assert.AreSame(assessmentSection.MacrostabilityInwards, failureMechanisms[2]); - Assert.AreSame(assessmentSection.Overtopping, failureMechanisms[3]); - Assert.AreSame(assessmentSection.Closing, failureMechanisms[4]); - Assert.AreSame(assessmentSection.FailingOfConstruction, failureMechanisms[5]); - Assert.AreSame(assessmentSection.StoneRevetment, failureMechanisms[6]); - Assert.AreSame(assessmentSection.AsphaltRevetment, failureMechanisms[7]); - Assert.AreSame(assessmentSection.GrassRevetment, failureMechanisms[8]); - Assert.AreSame(assessmentSection.DuneErosion, failureMechanisms[9]); + Assert.AreSame(assessmentSection.StabilityStoneCover, failureMechanisms[3]); + Assert.AreSame(assessmentSection.WaveImpactAsphaltCover, failureMechanisms[4]); + Assert.AreSame(assessmentSection.GrassCoverErosionOutside, failureMechanisms[5]); + Assert.AreSame(assessmentSection.GrassCoverSlipOffOutside, failureMechanisms[6]); + Assert.AreSame(assessmentSection.HeightStructure, failureMechanisms[7]); + Assert.AreSame(assessmentSection.ClosingStructure, failureMechanisms[8]); + Assert.AreSame(assessmentSection.PipingStructure, failureMechanisms[9]); + Assert.AreSame(assessmentSection.StrengthStabilityPointConstruction, failureMechanisms[10]); + Assert.AreSame(assessmentSection.DuneErosion, failureMechanisms[11]); } [Test] @@ -178,21 +186,22 @@ // Assert var failureMechanisms = assessmentSection.GetFailureMechanisms().ToArray(); - Assert.AreEqual(11, contribution.Length); + Assert.AreEqual(13, contribution.Length); - for (int i = 0; i < 10; i++) + for (int i = 0; i < 12; i++) { Assert.AreEqual(failureMechanisms[i].Name, contribution[i].Assessment); Assert.AreEqual(failureMechanisms[i].Contribution, contribution[i].Contribution); Assert.AreEqual(norm, contribution[i].Norm); Assert.AreEqual((norm/contribution[i].Contribution)*100, contribution[i].ProbabilitySpace); } - Assert.AreEqual("Overig", contribution[10].Assessment); + var otherContributionItem = contribution[12]; + Assert.AreEqual("Overig", otherContributionItem.Assessment); double expectedOtherContribution = composition == AssessmentSectionComposition.DikeAndDune ? 20.0 : 30.0; - Assert.AreEqual(expectedOtherContribution, contribution[10].Contribution); - Assert.AreEqual(norm, contribution[10].Norm); + Assert.AreEqual(expectedOtherContribution, otherContributionItem.Contribution); + Assert.AreEqual(norm, otherContributionItem.Norm); double expectedNorm = composition == AssessmentSectionComposition.DikeAndDune ? 150000 : 100000; - Assert.AreEqual(expectedNorm, contribution[10].ProbabilitySpace); + Assert.AreEqual(expectedNorm, otherContributionItem.ProbabilitySpace); } [Test] @@ -276,13 +285,15 @@ Assert.AreEqual(contributions[0], assessmentSection.PipingFailureMechanism.Contribution); Assert.AreEqual(contributions[1], assessmentSection.GrassCoverErosionInwards.Contribution); Assert.AreEqual(contributions[2], assessmentSection.MacrostabilityInwards.Contribution); - Assert.AreEqual(contributions[3], assessmentSection.Overtopping.Contribution); - Assert.AreEqual(contributions[4], assessmentSection.Closing.Contribution); - Assert.AreEqual(contributions[5], assessmentSection.FailingOfConstruction.Contribution); - Assert.AreEqual(contributions[6], assessmentSection.StoneRevetment.Contribution); - Assert.AreEqual(contributions[7], assessmentSection.AsphaltRevetment.Contribution); - Assert.AreEqual(contributions[8], assessmentSection.GrassRevetment.Contribution); - Assert.AreEqual(contributions[9], assessmentSection.DuneErosion.Contribution); + Assert.AreEqual(contributions[3], assessmentSection.StabilityStoneCover.Contribution); + Assert.AreEqual(contributions[4], assessmentSection.WaveImpactAsphaltCover.Contribution); + Assert.AreEqual(contributions[5], assessmentSection.GrassCoverErosionOutside.Contribution); + Assert.AreEqual(contributions[6], assessmentSection.GrassCoverSlipOffOutside.Contribution); + Assert.AreEqual(contributions[7], assessmentSection.HeightStructure.Contribution); + Assert.AreEqual(contributions[8], assessmentSection.ClosingStructure.Contribution); + Assert.AreEqual(contributions[9], assessmentSection.PipingStructure.Contribution); + Assert.AreEqual(contributions[10], assessmentSection.StrengthStabilityPointConstruction.Contribution); + Assert.AreEqual(contributions[11], assessmentSection.DuneErosion.Contribution); CollectionAssert.AreEqual(contributions, assessmentSection.FailureMechanismContribution.Distribution.Select(d => d.Contribution)); } @@ -298,12 +309,14 @@ 24, 24, 4, - 2, + 3, + 1, + 5, + 1, + 24, 4, 2, - 4, - 3, - 3, + 2, 0, 30 }; @@ -320,6 +333,8 @@ 0, 0, 0, + 0, + 0, 70, 30 }; @@ -330,12 +345,14 @@ 24, 24, 4, - 2, + 3, + 1, + 5, + 1, + 24, 4, 2, - 4, - 3, - 3, + 2, 10, 20 }; Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs =================================================================== diff -u -rfec99b77571cc0cf37b60f5ca257394714fde1d7 -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision fec99b77571cc0cf37b60f5ca257394714fde1d7) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -169,7 +169,7 @@ } /// - /// Looks up a localized string similar to Dijken - Piping. + /// Looks up a localized string similar to Dijken en dammen - Piping. /// public static string PipingFailureMechanism_DisplayName { get { Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx =================================================================== diff -u -rfec99b77571cc0cf37b60f5ca257394714fde1d7 -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision fec99b77571cc0cf37b60f5ca257394714fde1d7) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -172,7 +172,7 @@ Insteek sloot polderzijde - Dijken - Piping + Dijken en dammen - Piping De waarde voor het L-coördinaat van het uittredepunt moet groter zijn dan 0. Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r330586b375b0f21f7aa9f650827ffe29572a2f03 -r7206def3cee84d518d3f7ea1b76e05e3163b8aea --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision 330586b375b0f21f7aa9f650827ffe29572a2f03) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision 7206def3cee84d518d3f7ea1b76e05e3163b8aea) @@ -104,7 +104,7 @@ var text = info.Text(mechanismContext); // Assert - Assert.AreEqual("Dijken - Piping", text); + Assert.AreEqual("Dijken en dammen - Piping", text); mocks.VerifyAll(); }