Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs =================================================================== diff -u -r1caaf4ff6ddbfac31ffb72c906dfda74444d3961 -r73279cbae33a13f60ac8feec9be34f19ce7af49f --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision 1caaf4ff6ddbfac31ffb72c906dfda74444d3961) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Merge/AssessmentSectionMergeHandlerTest.cs (.../AssessmentSectionMergeHandlerTest.cs) (revision 73279cbae33a13f60ac8feec9be34f19ce7af49f) @@ -1229,8 +1229,8 @@ AssessmentSection targetAssessmentSection = CreateAssessmentSection(locations); AssessmentSection sourceAssessmentSection = CreateAssessmentSection(locations); - IEnumerable targetCalculations = getCalculationsFunc(targetAssessmentSection); - IEnumerable sourceCalculations = getCalculationsFunc(sourceAssessmentSection); + IEnumerable targetCalculations = GetDuneLocationCalculations(targetAssessmentSection); + IEnumerable sourceCalculations = GetDuneLocationCalculations(sourceAssessmentSection); SetOutput(targetCalculations); sourceCalculations.ForEachElementDo(c => c.InputParameters.ShouldIllustrationPointsBeCalculated = true); @@ -1274,8 +1274,8 @@ AssessmentSection targetAssessmentSection = CreateAssessmentSection(locations); AssessmentSection sourceAssessmentSection = CreateAssessmentSection(locations); - IEnumerable targetCalculations = getCalculationsFunc(targetAssessmentSection); - IEnumerable sourceCalculations = getCalculationsFunc(sourceAssessmentSection); + IEnumerable targetCalculations = GetDuneLocationCalculations(targetAssessmentSection); + IEnumerable sourceCalculations = GetDuneLocationCalculations(sourceAssessmentSection); SetOutput(targetCalculations); SetOutput(sourceCalculations); @@ -1324,8 +1324,8 @@ AssessmentSection targetAssessmentSection = CreateAssessmentSection(locations); AssessmentSection sourceAssessmentSection = CreateAssessmentSection(locations); - IEnumerable targetCalculations = getCalculationsFunc(targetAssessmentSection); - IEnumerable sourceCalculations = getCalculationsFunc(sourceAssessmentSection); + IEnumerable targetCalculations = GetDuneLocationCalculations(targetAssessmentSection); + IEnumerable sourceCalculations = GetDuneLocationCalculations(sourceAssessmentSection); SetOutput(sourceCalculations); sourceCalculations.ForEachElementDo(c => c.InputParameters.ShouldIllustrationPointsBeCalculated = true); @@ -1369,8 +1369,8 @@ AssessmentSection targetAssessmentSection = CreateAssessmentSection(locations); AssessmentSection sourceAssessmentSection = CreateAssessmentSection(locations); - IEnumerable targetCalculations = getCalculationsFunc(targetAssessmentSection); - IEnumerable sourceCalculations = getCalculationsFunc(sourceAssessmentSection); + IEnumerable targetCalculations = GetDuneLocationCalculations(targetAssessmentSection); + IEnumerable sourceCalculations = GetDuneLocationCalculations(sourceAssessmentSection); SetOutput(targetCalculations, true); SetOutput(sourceCalculations); @@ -1416,8 +1416,8 @@ AssessmentSection targetAssessmentSection = CreateAssessmentSection(locations); AssessmentSection sourceAssessmentSection = CreateAssessmentSection(locations); - IEnumerable targetCalculations = getCalculationsFunc(targetAssessmentSection); - IEnumerable sourceCalculations = getCalculationsFunc(sourceAssessmentSection); + IEnumerable targetCalculations = GetDuneLocationCalculations(targetAssessmentSection); + IEnumerable sourceCalculations = GetDuneLocationCalculations(sourceAssessmentSection); SetOutput(targetCalculations); SetOutput(sourceCalculations, true); @@ -1461,8 +1461,8 @@ AssessmentSection targetAssessmentSection = CreateAssessmentSection(locations); AssessmentSection sourceAssessmentSection = CreateAssessmentSection(locations); - IEnumerable targetCalculations = getCalculationsFunc(targetAssessmentSection); - IEnumerable sourceCalculations = getCalculationsFunc(sourceAssessmentSection); + IEnumerable targetCalculations = GetDuneLocationCalculations(targetAssessmentSection); + IEnumerable sourceCalculations = GetDuneLocationCalculations(sourceAssessmentSection); SetOutput(targetCalculations, true); SetOutput(sourceCalculations, true); @@ -1513,8 +1513,8 @@ AssessmentSection targetAssessmentSection = CreateAssessmentSection(locations); AssessmentSection sourceAssessmentSection = CreateAssessmentSection(locations); - IEnumerable targetCalculations = getCalculationsFunc(targetAssessmentSection); - IEnumerable sourceCalculations = getCalculationsFunc(sourceAssessmentSection); + IEnumerable targetCalculations = GetDuneLocationCalculations(targetAssessmentSection); + IEnumerable sourceCalculations = GetDuneLocationCalculations(sourceAssessmentSection); targetCalculations.ForEachElementDo(calculation => calculation.Attach(observer)); @@ -1554,8 +1554,8 @@ AssessmentSection targetAssessmentSection = CreateAssessmentSection(locations); AssessmentSection sourceAssessmentSection = CreateAssessmentSection(locations); - IEnumerable targetCalculations = getCalculationsFunc(targetAssessmentSection); - IEnumerable sourceCalculations = getCalculationsFunc(sourceAssessmentSection); + IEnumerable targetCalculations = GetDuneLocationCalculations(targetAssessmentSection); + IEnumerable sourceCalculations = GetDuneLocationCalculations(sourceAssessmentSection); targetCalculations.ForEachElementDo(calculation => calculation.Attach(observer)); @@ -1727,6 +1727,12 @@ mocks.VerifyAll(); } + private static IEnumerable GetDuneLocationCalculations(AssessmentSection assessmentSection) + { + return assessmentSection.DuneErosion.DuneLocationCalculationsForUserDefinedTargetProbabilities + .SelectMany(c => c.DuneLocationCalculations); + } + private static void SetOutput(IEnumerable calculations) { foreach (DuneLocationCalculation calculation in calculations)