Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -r377971ba79970be3f1ad8afa1264a1724af94627 -r8a45113465dd347e1f382345cb4c6b578232585e --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 377971ba79970be3f1ad8afa1264a1724af94627) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 8a45113465dd347e1f382345cb4c6b578232585e) @@ -113,7 +113,7 @@ entity.ReadPipingMechanismSectionResults(failureMechanism, collector); ReadPipingRootCalculationGroup(entity.CalculationGroupEntity, failureMechanism.CalculationsGroup, - failureMechanism.GeneralInput, collector); + failureMechanism.GeneralInput, collector); } private static void ReadProbabilityAssessmentInput(ICollection pipingFailureMechanismMetaEntities, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput) @@ -136,8 +136,9 @@ } private static void ReadPipingRootCalculationGroup(CalculationGroupEntity rootCalculationGroupEntity, - CalculationGroup targetRootCalculationGroup, GeneralPipingInput generalPipingInput, - ReadConversionCollector collector) + CalculationGroup targetRootCalculationGroup, + GeneralPipingInput generalPipingInput, + ReadConversionCollector collector) { CalculationGroup rootCalculationGroup = rootCalculationGroupEntity.ReadAsPipingCalculationGroup(collector, generalPipingInput); foreach (ICalculationBase calculationBase in rootCalculationGroup.Children) @@ -190,8 +191,8 @@ } private static void ReadGrassCoverErosionInwardsRootCalculationGroup(CalculationGroupEntity rootCalculationGroupEntity, - CalculationGroup targetRootCalculationGroup, - ReadConversionCollector collector) + CalculationGroup targetRootCalculationGroup, + ReadConversionCollector collector) { CalculationGroup rootCalculationGroup = rootCalculationGroupEntity.ReadAsGrassCoverErosionInwardsCalculationGroup(collector); foreach (ICalculationBase calculationBase in rootCalculationGroup.Children) @@ -420,8 +421,8 @@ } private static void ReadWaveImpactAsphaltCoverRootCalculationGroup(CalculationGroupEntity rootCalculationGroupEntity, - CalculationGroup targetRootCalculationGroup, - ReadConversionCollector collector) + CalculationGroup targetRootCalculationGroup, + ReadConversionCollector collector) { CalculationGroup rootCalculationGroup = rootCalculationGroupEntity.ReadAsWaveImpactAsphaltCoverWaveConditionsCalculationGroup(collector); foreach (ICalculationBase calculationBase in rootCalculationGroup.Children) @@ -473,7 +474,7 @@ } private static void ReadGrassCoverErosionOutwardsWaveConditionsRootCalculationGroup(CalculationGroupEntity rootCalculationGroupEntity, - CalculationGroup targetRootCalculationGroup, ReadConversionCollector collector) + CalculationGroup targetRootCalculationGroup, ReadConversionCollector collector) { CalculationGroup rootCalculationGroup = rootCalculationGroupEntity.ReadAsGrassCoverErosionOutwardsWaveConditionsCalculationGroup(collector); foreach (ICalculationBase calculationBase in rootCalculationGroup.Children) @@ -656,7 +657,7 @@ } private static void ReadStabilityStoneCoverWaveConditionsRootCalculationGroup(CalculationGroupEntity rootCalculationGroupEntity, - CalculationGroup targetRootCalculationGroup, ReadConversionCollector collector) + CalculationGroup targetRootCalculationGroup, ReadConversionCollector collector) { CalculationGroup rootCalculationGroup = rootCalculationGroupEntity.ReadAsStabilityStoneCoverWaveConditionsCalculationGroup(collector); foreach (ICalculationBase calculationBase in rootCalculationGroup.Children) Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -rdda7c7ea334bc1e281afdad71f42b7c7c0f5dd7a -r8a45113465dd347e1f382345cb4c6b578232585e --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision dda7c7ea334bc1e281afdad71f42b7c7c0f5dd7a) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 8a45113465dd347e1f382345cb4c6b578232585e) @@ -340,6 +340,7 @@ var entity = CreateAssessmentSectionEntity(); const string comments = "Some text"; + var n = new Random(21).Next(1,20); var failureMechanismEntity = new FailureMechanismEntity { FailureMechanismType = (int) FailureMechanismType.GrassRevetmentTopErosionAndInwards, @@ -350,7 +351,7 @@ { new GrassCoverErosionInwardsFailureMechanismMetaEntity { - N = 1 + N = n } } }; @@ -364,6 +365,7 @@ // Assert Assert.AreEqual(isRelevant, section.GrassCoverErosionInwards.IsRelevant); Assert.AreEqual(comments, section.GrassCoverErosionInwards.Comments); + Assert.AreEqual(n, section.GrassCoverErosionInwards.GeneralInput.N); } [Test] @@ -449,6 +451,7 @@ var entity = CreateAssessmentSectionEntity(); const string comments = "Some text"; + var n = new Random(21).Next(1, 20); var failureMechanismEntity = new FailureMechanismEntity { FailureMechanismType = (int) FailureMechanismType.GrassRevetmentErosionOutwards, @@ -459,7 +462,7 @@ { new GrassCoverErosionOutwardsFailureMechanismMetaEntity { - N = 1 + N = n } } }; @@ -473,6 +476,7 @@ // Assert Assert.AreEqual(isRelevant, section.GrassCoverErosionOutwards.IsRelevant); Assert.AreEqual(comments, section.GrassCoverErosionOutwards.Comments); + Assert.AreEqual(n, section.GrassCoverErosionOutwards.GeneralInput.N); } [Test] Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs =================================================================== diff -u -r83a72354e69c186ca436bbe29e31122b9b8f4c3a -r8a45113465dd347e1f382345cb4c6b578232585e --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs (.../CalculationGroupEntityReadExtentionsTest.cs) (revision 83a72354e69c186ca436bbe29e31122b9b8f4c3a) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs (.../CalculationGroupEntityReadExtentionsTest.cs) (revision 8a45113465dd347e1f382345cb4c6b578232585e) @@ -112,15 +112,15 @@ { new CalculationGroupEntity { - Name = "ABA", - IsEditable = 0, - Order = 0 - }, - new CalculationGroupEntity - { Name = "ABB", IsEditable = 1, Order = 1 + }, + new CalculationGroupEntity + { + Name = "ABA", + IsEditable = 0, + Order = 0 } }, Order = 1 @@ -169,15 +169,15 @@ { new PipingCalculationEntity { - Order = 0, - Name = "1", - DampingFactorExitMean = 1, - }, - new PipingCalculationEntity - { Order = 1, Name = "2", DampingFactorExitMean = 2, + }, + new PipingCalculationEntity + { + Order = 0, + Name = "1", + DampingFactorExitMean = 1, } } }; @@ -225,13 +225,13 @@ { new CalculationGroupEntity { - Order = 1, - Name = "group1" + Order = 3, + Name = "group2" }, new CalculationGroupEntity { - Order = 3, - Name = "group2" + Order = 1, + Name = "group1" } } }; @@ -308,30 +308,30 @@ { new CalculationGroupEntity { - Name = "AA", - IsEditable = 1, - Order = 0 - }, - new CalculationGroupEntity - { Name = "AB", IsEditable = 0, CalculationGroupEntity1 = { new CalculationGroupEntity { - Name = "ABA", - IsEditable = 0, - Order = 0 - }, - new CalculationGroupEntity - { Name = "ABB", IsEditable = 1, Order = 1 + }, + new CalculationGroupEntity + { + Name = "ABA", + IsEditable = 0, + Order = 0 } }, Order = 1 + }, + new CalculationGroupEntity + { + Name = "AA", + IsEditable = 1, + Order = 0 } } }; @@ -414,13 +414,13 @@ { new GrassCoverErosionInwardsCalculationEntity { - Order = 0, - Name = "calculation1" + Order = 2, + Name = "calculation2" }, new GrassCoverErosionInwardsCalculationEntity { - Order = 2, - Name = "calculation2" + Order = 0, + Name = "calculation1" } }, CalculationGroupEntity1 = @@ -509,12 +509,6 @@ { new CalculationGroupEntity { - Name = "AA", - IsEditable = 1, - Order = 0 - }, - new CalculationGroupEntity - { Name = "AB", IsEditable = 0, CalculationGroupEntity1 = @@ -533,6 +527,12 @@ } }, Order = 1 + }, + new CalculationGroupEntity + { + Name = "AA", + IsEditable = 1, + Order = 0 } } }; @@ -615,12 +615,6 @@ { new CalculationGroupEntity { - Name = "AA", - IsEditable = 1, - Order = 0 - }, - new CalculationGroupEntity - { Name = "AB", IsEditable = 0, CalculationGroupEntity1 = @@ -639,6 +633,12 @@ } }, Order = 1 + }, + new CalculationGroupEntity + { + Name = "AA", + IsEditable = 1, + Order = 0 } } }; @@ -683,13 +683,13 @@ { new StabilityStoneCoverWaveConditionsCalculationEntity { - Order = 0, - Name = "1" + Order = 1, + Name = "2" }, new StabilityStoneCoverWaveConditionsCalculationEntity { - Order = 1, - Name = "2" + Order = 0, + Name = "1" } } }; @@ -734,13 +734,13 @@ { new CalculationGroupEntity { - Order = 1, - Name = "group1" + Order = 3, + Name = "group2" }, new CalculationGroupEntity { - Order = 3, - Name = "group2" + Order = 1, + Name = "group1" } } }; @@ -816,12 +816,6 @@ { new CalculationGroupEntity { - Name = "AA", - IsEditable = 1, - Order = 0 - }, - new CalculationGroupEntity - { Name = "AB", IsEditable = 0, CalculationGroupEntity1 = @@ -840,6 +834,12 @@ } }, Order = 1 + }, + new CalculationGroupEntity + { + Name = "AA", + IsEditable = 1, + Order = 0 } } }; @@ -872,6 +872,5 @@ Assert.IsTrue(rootChildGroup1Child2.IsNameEditable); CollectionAssert.IsEmpty(rootChildGroup1Child2.Children); } - } } \ No newline at end of file