Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs =================================================================== diff -u -r4587990a169c2284a25dbf50cb70e0fe5ca5e302 -rae6e443d1963abf95cc010698defef8b60e5c79f --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs (.../CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs) (revision 4587990a169c2284a25dbf50cb70e0fe5ca5e302) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs (.../CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs) (revision ae6e443d1963abf95cc010698defef8b60e5c79f) @@ -84,6 +84,7 @@ // Setup var random = new Random(21); var assessmentSection = new AssessmentSection(random.NextEnumValue()); + assessmentSection.SpecificFailurePaths.Add(new SpecificFailurePath()); Dictionary failureMechanisms = assessmentSection.GetFailureMechanisms() .Concat(assessmentSection.SpecificFailurePaths) .Where(fm => fm.InAssembly) @@ -129,9 +130,10 @@ Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.PipingStructure]), results[i].PipingStructure); Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.StabilityPointStructures]), results[i].StabilityPointStructures); Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.DuneErosion]), results[i].DuneErosion); + Assert.AreEqual(assessmentSection.SpecificFailurePaths.Count, results[i].SpecificFailurePaths.Length); foreach (SpecificFailurePath specificFailurePath in assessmentSection.SpecificFailurePaths) { - Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[specificFailurePath]), results[i].SpecificFailurePaths); + Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[specificFailurePath]), results[i].SpecificFailurePaths.First()); } } } @@ -142,6 +144,7 @@ // Setup var random = new Random(21); var assessmentSection = new AssessmentSection(random.NextEnumValue()); + assessmentSection.SpecificFailurePaths.Add(new SpecificFailurePath()); Dictionary failureMechanisms = assessmentSection.GetFailureMechanisms() .Concat(assessmentSection.SpecificFailurePaths) .Where(fm => fm.InAssembly) @@ -185,6 +188,7 @@ Assert.IsNull(results[i].ClosingStructures); Assert.IsNull(results[i].PipingStructure); Assert.IsNull(results[i].StabilityPointStructures); + Assert.AreEqual(assessmentSection.SpecificFailurePaths.Count, results[i].SpecificFailurePaths.Length); Assert.IsNull(results[i].DuneErosion); foreach (FailureMechanismSectionAssemblyGroup? specificFailurePath in results[i].SpecificFailurePaths) { Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultTest.cs =================================================================== diff -u -r3b8af87670276af35694f1552a430fd41d91ae18 -rae6e443d1963abf95cc010698defef8b60e5c79f --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultTest.cs (.../CombinedFailureMechanismSectionAssemblyResultTest.cs) (revision 3b8af87670276af35694f1552a430fd41d91ae18) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultTest.cs (.../CombinedFailureMechanismSectionAssemblyResultTest.cs) (revision ae6e443d1963abf95cc010698defef8b60e5c79f) @@ -111,11 +111,11 @@ var pipingStructureResult = random.NextEnumValue(); var stabilityPointStructuresResult = random.NextEnumValue(); var duneErosionResult = random.NextEnumValue(); - var specificFailurePathsResult = new FailureMechanismSectionAssemblyGroup?[] + var specificFailurePathsResult = new FailureMechanismSectionAssemblyGroup?[] { - random.NextEnumValue(), - random.NextEnumValue(), - random.NextEnumValue() + random.NextEnumValue(), + random.NextEnumValue(), + random.NextEnumValue() }; // Call @@ -173,6 +173,12 @@ double sectionStart = random.NextDouble(); double sectionEnd = random.NextDouble(); var totalResult = random.NextEnumValue(); + var specificFailurePathResults = new FailureMechanismSectionAssemblyGroup?[] + { + null, + null, + null + }; // Call var result = new CombinedFailureMechanismSectionAssemblyResult( @@ -194,12 +200,7 @@ PipingStructure = null, StabilityPointStructures = null, DuneErosion = null, - SpecificFailurePaths = new FailureMechanismSectionAssemblyGroup?[] - { - null, - null, - null - } + SpecificFailurePaths = specificFailurePathResults }); // Assert @@ -222,6 +223,7 @@ Assert.IsNull(result.PipingStructure); Assert.IsNull(result.StabilityPointStructures); Assert.IsNull(result.DuneErosion); + Assert.AreEqual(specificFailurePathResults.Length, result.SpecificFailurePaths.Length); foreach (FailureMechanismSectionAssemblyGroup? specificFailurePathResult in result.SpecificFailurePaths) { Assert.IsNull(specificFailurePathResult);