Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/IllustrationPointNodeCreateExtensions.cs =================================================================== diff -u -r20a1edec7117a9cfee64e29c5eb7f00f4375e9c5 -r7885455b0db0c345ed798e8b8ca29158a93fcc5a --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/IllustrationPointNodeCreateExtensions.cs (.../IllustrationPointNodeCreateExtensions.cs) (revision 20a1edec7117a9cfee64e29c5eb7f00f4375e9c5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/IllustrationPointNodeCreateExtensions.cs (.../IllustrationPointNodeCreateExtensions.cs) (revision 7885455b0db0c345ed798e8b8ca29158a93fcc5a) @@ -100,7 +100,7 @@ var subMechanismIllustrationPoint = node.Data as SubMechanismIllustrationPoint; if (subMechanismIllustrationPoint != null) { - entity.SubMechanismIllustrationPointEntities.Add(subMechanismIllustrationPoint.Create()); + entity.SubMechanismIllustrationPointEntities.Add(subMechanismIllustrationPoint.Create(i + 1)); } } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/SubMechanismIllustrationPointCreateExtensions.cs =================================================================== diff -u -ref5e8f54613f8dd00da958f15f730aa4a1899223 -r7885455b0db0c345ed798e8b8ca29158a93fcc5a --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/SubMechanismIllustrationPointCreateExtensions.cs (.../SubMechanismIllustrationPointCreateExtensions.cs) (revision ef5e8f54613f8dd00da958f15f730aa4a1899223) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/SubMechanismIllustrationPointCreateExtensions.cs (.../SubMechanismIllustrationPointCreateExtensions.cs) (revision 7885455b0db0c345ed798e8b8ca29158a93fcc5a) @@ -39,11 +39,14 @@ /// /// The sub mechanism illustration /// point to create a database entity for. + /// The index at which + /// resides within its parent. /// A new . /// Thrown when /// is null. internal static SubMechanismIllustrationPointEntity Create( - this SubMechanismIllustrationPoint subMechanismIllustrationPoint) + this SubMechanismIllustrationPoint subMechanismIllustrationPoint, + int order) { if (subMechanismIllustrationPoint == null) { @@ -53,7 +56,8 @@ var entity = new SubMechanismIllustrationPointEntity { Beta = subMechanismIllustrationPoint.Beta, - Name = subMechanismIllustrationPoint.Name.DeepClone() + Name = subMechanismIllustrationPoint.Name.DeepClone(), + Order = order }; AddEntitiesForSubMechanismIllustrationPointsStochasts(entity, subMechanismIllustrationPoint.Stochasts); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/TopLevelSubMechanismIllustrationPointCreateExtensions.cs =================================================================== diff -u -ref5e8f54613f8dd00da958f15f730aa4a1899223 -r7885455b0db0c345ed798e8b8ca29158a93fcc5a --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/TopLevelSubMechanismIllustrationPointCreateExtensions.cs (.../TopLevelSubMechanismIllustrationPointCreateExtensions.cs) (revision ef5e8f54613f8dd00da958f15f730aa4a1899223) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/TopLevelSubMechanismIllustrationPointCreateExtensions.cs (.../TopLevelSubMechanismIllustrationPointCreateExtensions.cs) (revision 7885455b0db0c345ed798e8b8ca29158a93fcc5a) @@ -60,7 +60,7 @@ WindDirectionAngle = windDirection.Angle, SubMechanismIllustrationPointEntity = topLevelSubMechanismIllustrationPoint.SubMechanismIllustrationPoint - .Create(), + .Create(0), Order = order }; } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/SubMechanismIllustrationPointCreateExtensionsTest.cs =================================================================== diff -u -ref5e8f54613f8dd00da958f15f730aa4a1899223 -r7885455b0db0c345ed798e8b8ca29158a93fcc5a --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/SubMechanismIllustrationPointCreateExtensionsTest.cs (.../SubMechanismIllustrationPointCreateExtensionsTest.cs) (revision ef5e8f54613f8dd00da958f15f730aa4a1899223) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/SubMechanismIllustrationPointCreateExtensionsTest.cs (.../SubMechanismIllustrationPointCreateExtensionsTest.cs) (revision 7885455b0db0c345ed798e8b8ca29158a93fcc5a) @@ -37,7 +37,7 @@ public void Create_IllustrationPointNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => ((SubMechanismIllustrationPoint) null).Create(); + TestDelegate call = () => ((SubMechanismIllustrationPoint) null).Create(0); // Assert var exception = Assert.Throws(call); @@ -54,13 +54,14 @@ random.NextDouble(), Enumerable.Empty(), Enumerable.Empty()); + int order = random.Next(); // Call - SubMechanismIllustrationPointEntity entity = illustrationPoint.Create(); + SubMechanismIllustrationPointEntity entity = illustrationPoint.Create(order); // Assert AssertCommonProperties(illustrationPoint, entity); - + Assert.AreEqual(order, entity.Order); CollectionAssert.IsEmpty(entity.IllustrationPointResultEntities); CollectionAssert.IsEmpty(entity.SubMechanismIllustrationPointStochastEntities); } @@ -88,13 +89,14 @@ random.NextDouble(), stochasts, Enumerable.Empty()); + int order = random.Next(); // Call - SubMechanismIllustrationPointEntity entity = illustrationPoint.Create(); + SubMechanismIllustrationPointEntity entity = illustrationPoint.Create(order); // Assert AssertCommonProperties(illustrationPoint, entity); - + Assert.AreEqual(order, entity.Order); SubMechanismIllustrationPointStochastEntity[] stochastEntities = entity.SubMechanismIllustrationPointStochastEntities.ToArray(); int expectedNrOfStochasts = stochasts.Length; @@ -130,13 +132,14 @@ random.NextDouble(), Enumerable.Empty(), illustrationPointResults); + int order = random.Next(); // Call - SubMechanismIllustrationPointEntity entity = illustrationPoint.Create(); + SubMechanismIllustrationPointEntity entity = illustrationPoint.Create(order); // Assert AssertCommonProperties(illustrationPoint, entity); - + Assert.AreEqual(order, entity.Order); IllustrationPointResultEntity[] resultEntities = entity.IllustrationPointResultEntities.ToArray(); int expectedNrOfIllustrationPoints = illustrationPointResults.Length; Assert.AreEqual(expectedNrOfIllustrationPoints, resultEntities.Length);