Index: Riskeer/Integration/src/Riskeer.Integration.Util/FailureMechanismSectionAssemblyGroupsHelper.cs =================================================================== diff -u -rc295f28de2208b7a7f1ff6cf24d5cb81cf4fa1e7 -ra492926adc86036b5c8f67044da837c9febf3e55 --- Riskeer/Integration/src/Riskeer.Integration.Util/FailureMechanismSectionAssemblyGroupsHelper.cs (.../FailureMechanismSectionAssemblyGroupsHelper.cs) (revision c295f28de2208b7a7f1ff6cf24d5cb81cf4fa1e7) +++ Riskeer/Integration/src/Riskeer.Integration.Util/FailureMechanismSectionAssemblyGroupsHelper.cs (.../FailureMechanismSectionAssemblyGroupsHelper.cs) (revision a492926adc86036b5c8f67044da837c9febf3e55) @@ -59,7 +59,8 @@ .Concat(new[] { new FailureMechanismSectionAssemblyGroupBoundaries(double.NaN, double.NaN, FailureMechanismSectionAssemblyGroup.Dominant), - new FailureMechanismSectionAssemblyGroupBoundaries(double.NaN, double.NaN, FailureMechanismSectionAssemblyGroup.NotDominant) + new FailureMechanismSectionAssemblyGroupBoundaries(double.NaN, double.NaN, FailureMechanismSectionAssemblyGroup.NotDominant), + new FailureMechanismSectionAssemblyGroupBoundaries(double.NaN, double.NaN, FailureMechanismSectionAssemblyGroup.Nr) }) .ToArray(); } Index: Riskeer/Integration/test/Riskeer.Integration.Util.Test/FailureMechanismSectionAssemblyGroupsHelperTest.cs =================================================================== diff -u -rc44e94b38a58f622d2724a84d2741480766d9dd1 -ra492926adc86036b5c8f67044da837c9febf3e55 --- Riskeer/Integration/test/Riskeer.Integration.Util.Test/FailureMechanismSectionAssemblyGroupsHelperTest.cs (.../FailureMechanismSectionAssemblyGroupsHelperTest.cs) (revision c44e94b38a58f622d2724a84d2741480766d9dd1) +++ Riskeer/Integration/test/Riskeer.Integration.Util.Test/FailureMechanismSectionAssemblyGroupsHelperTest.cs (.../FailureMechanismSectionAssemblyGroupsHelperTest.cs) (revision a492926adc86036b5c8f67044da837c9febf3e55) @@ -57,34 +57,39 @@ FailureMechanismSectionAssemblyGroupBoundariesCalculatorStub calculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyGroupBoundariesCalculator; // Call - IEnumerable assemblyGroupBoundaries = - FailureMechanismSectionAssemblyGroupsHelper.GetFailureMechanismSectionAssemblyGroupBoundaries(assessmentSection); + FailureMechanismSectionAssemblyGroupBoundaries[] assemblyGroupBoundaries = + FailureMechanismSectionAssemblyGroupsHelper.GetFailureMechanismSectionAssemblyGroupBoundaries(assessmentSection).ToArray(); // Assert - Assert.AreEqual(calculator.FailureMechanismSectionAssemblyGroupBoundariesOutput.Count() + 2, assemblyGroupBoundaries.Count()); + Assert.AreEqual(calculator.FailureMechanismSectionAssemblyGroupBoundariesOutput.Count() + 3, assemblyGroupBoundaries.Length); - for (int i = 0; i < calculator.FailureMechanismSectionAssemblyGroupBoundariesOutput.Count(); i++) + for (var i = 0; i < calculator.FailureMechanismSectionAssemblyGroupBoundariesOutput.Count(); i++) { FailureMechanismSectionAssemblyGroupBoundaries expectedBoundary = calculator.FailureMechanismSectionAssemblyGroupBoundariesOutput.ElementAt(i); - FailureMechanismSectionAssemblyGroupBoundaries actualBoundary = assemblyGroupBoundaries.ElementAt(i); - + FailureMechanismSectionAssemblyGroupBoundaries actualBoundary = assemblyGroupBoundaries[i]; + Assert.AreEqual(expectedBoundary.FailureMechanismSectionAssemblyGroup, actualBoundary.FailureMechanismSectionAssemblyGroup); Assert.AreEqual(expectedBoundary.LowerBoundary, actualBoundary.LowerBoundary); Assert.AreEqual(expectedBoundary.UpperBoundary, actualBoundary.UpperBoundary); } - FailureMechanismSectionAssemblyGroupBoundaries lastAssemblyGroupBoundaries = assemblyGroupBoundaries.Last(); - Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NotDominant, lastAssemblyGroupBoundaries.FailureMechanismSectionAssemblyGroup); - Assert.AreEqual(double.NaN, lastAssemblyGroupBoundaries.UpperBoundary); - Assert.AreEqual(double.NaN, lastAssemblyGroupBoundaries.LowerBoundary); + FailureMechanismSectionAssemblyGroupBoundaries dominantGroupBoundaries = assemblyGroupBoundaries[assemblyGroupBoundaries.Length - 3]; + Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Dominant, dominantGroupBoundaries.FailureMechanismSectionAssemblyGroup); + Assert.AreEqual(double.NaN, dominantGroupBoundaries.UpperBoundary); + Assert.AreEqual(double.NaN, dominantGroupBoundaries.LowerBoundary); - FailureMechanismSectionAssemblyGroupBoundaries secondLastAssemblyGroupBoundaries = assemblyGroupBoundaries.ElementAt(assemblyGroupBoundaries.Count() - 2); - Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Dominant, secondLastAssemblyGroupBoundaries.FailureMechanismSectionAssemblyGroup); - Assert.AreEqual(double.NaN, secondLastAssemblyGroupBoundaries.UpperBoundary); - Assert.AreEqual(double.NaN, secondLastAssemblyGroupBoundaries.LowerBoundary); + FailureMechanismSectionAssemblyGroupBoundaries notDominantGroupBoundaries = assemblyGroupBoundaries[assemblyGroupBoundaries.Length - 2]; + Assert.AreEqual(FailureMechanismSectionAssemblyGroup.NotDominant, notDominantGroupBoundaries.FailureMechanismSectionAssemblyGroup); + Assert.AreEqual(double.NaN, notDominantGroupBoundaries.UpperBoundary); + Assert.AreEqual(double.NaN, notDominantGroupBoundaries.LowerBoundary); + + FailureMechanismSectionAssemblyGroupBoundaries notRelevantGroupBoundaries = assemblyGroupBoundaries[assemblyGroupBoundaries.Length - 1]; + Assert.AreEqual(FailureMechanismSectionAssemblyGroup.Nr, notRelevantGroupBoundaries.FailureMechanismSectionAssemblyGroup); + Assert.AreEqual(double.NaN, notRelevantGroupBoundaries.UpperBoundary); + Assert.AreEqual(double.NaN, notRelevantGroupBoundaries.LowerBoundary); } } - + [Test] public void CreateAssemblyGroupsView_CalculatorThrowsException_ReturnsEmptyCollectionOfAssemblyGroupBoundaries() {