Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/CombinedFailureMechanismSectionAssembly.cs =================================================================== diff -u -rd459c50c7e956f463da7a4ab51df3316d3f03afa -rae9d949883292cdf4d7fb5dd9c21313d43cbd3ca --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/CombinedFailureMechanismSectionAssembly.cs (.../CombinedFailureMechanismSectionAssembly.cs) (revision d459c50c7e956f463da7a4ab51df3316d3f03afa) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/CombinedFailureMechanismSectionAssembly.cs (.../CombinedFailureMechanismSectionAssembly.cs) (revision ae9d949883292cdf4d7fb5dd9c21313d43cbd3ca) @@ -33,23 +33,24 @@ /// Creates a new instance of . /// /// The section of the assembly. - /// The assembly group results per failure mechanism. + /// The failure mechanism section + /// assembly group results per failure mechanism. /// Thrown when any parameter is null. public CombinedFailureMechanismSectionAssembly(CombinedAssemblyFailureMechanismSection section, - IEnumerable failureMechanismAssemblyGroupResults) + IEnumerable failureMechanismSectionAssemblyGroupResults) { if (section == null) { throw new ArgumentNullException(nameof(section)); } - if (failureMechanismAssemblyGroupResults == null) + if (failureMechanismSectionAssemblyGroupResults == null) { - throw new ArgumentNullException(nameof(failureMechanismAssemblyGroupResults)); + throw new ArgumentNullException(nameof(failureMechanismSectionAssemblyGroupResults)); } Section = section; - FailureMechanismAssemblyGroupResults = failureMechanismAssemblyGroupResults; + FailureMechanismSectionAssemblyGroupResults = failureMechanismSectionAssemblyGroupResults; } /// @@ -58,8 +59,8 @@ public CombinedAssemblyFailureMechanismSection Section { get; } /// - /// Gets the assembly group results per failure mechanism. + /// Gets the failure mechanism section assembly group results per failure mechanism. /// - public IEnumerable FailureMechanismAssemblyGroupResults { get; } + public IEnumerable FailureMechanismSectionAssemblyGroupResults { get; } } } \ No newline at end of file Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/CombinedFailureMechanismSectionAssemblyTest.cs =================================================================== diff -u -rd459c50c7e956f463da7a4ab51df3316d3f03afa -rae9d949883292cdf4d7fb5dd9c21313d43cbd3ca --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/CombinedFailureMechanismSectionAssemblyTest.cs (.../CombinedFailureMechanismSectionAssemblyTest.cs) (revision d459c50c7e956f463da7a4ab51df3316d3f03afa) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/CombinedFailureMechanismSectionAssemblyTest.cs (.../CombinedFailureMechanismSectionAssemblyTest.cs) (revision ae9d949883292cdf4d7fb5dd9c21313d43cbd3ca) @@ -42,7 +42,7 @@ } [Test] - public void Constructor_FailureMechanismAssemblyGroupResultsNull_ThrowsArgumentNullException() + public void Constructor_FailureMechanismSectionAssemblyGroupResultsNull_ThrowsArgumentNullException() { // Setup var random = new Random(21); @@ -54,7 +54,7 @@ // Assert var exception = Assert.Throws(Call); - Assert.AreEqual("failureMechanismAssemblyGroupResults", exception.ParamName); + Assert.AreEqual("failureMechanismSectionAssemblyGroupResults", exception.ParamName); } [Test] @@ -71,7 +71,7 @@ // Assert Assert.AreSame(section, assembly.Section); - Assert.AreSame(failureMechanismSectionAssemblyGroups, assembly.FailureMechanismAssemblyGroupResults); + Assert.AreSame(failureMechanismSectionAssemblyGroups, assembly.FailureMechanismSectionAssemblyGroupResults); } } } \ No newline at end of file Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/CombinedFailureMechanismSectionAssemblyAssert.cs =================================================================== diff -u -rf7980ec2b340d46fd4b2ecba0ea5de19dde2f6ea -rae9d949883292cdf4d7fb5dd9c21313d43cbd3ca --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/CombinedFailureMechanismSectionAssemblyAssert.cs (.../CombinedFailureMechanismSectionAssemblyAssert.cs) (revision f7980ec2b340d46fd4b2ecba0ea5de19dde2f6ea) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/CombinedFailureMechanismSectionAssemblyAssert.cs (.../CombinedFailureMechanismSectionAssemblyAssert.cs) (revision ae9d949883292cdf4d7fb5dd9c21313d43cbd3ca) @@ -56,13 +56,13 @@ actualCombinedFailureMechanismSectionAssembly.Section.AssemblyGroup); FailureMechanismSectionList[] failureMechanismResults = original.ResultPerFailureMechanism.ToArray(); - Assert.AreEqual(failureMechanismResults.Length, actualCombinedFailureMechanismSectionAssembly.FailureMechanismAssemblyGroupResults.Count()); + Assert.AreEqual(failureMechanismResults.Length, actualCombinedFailureMechanismSectionAssembly.FailureMechanismSectionAssemblyGroupResults.Count()); for (var j = 0; j < failureMechanismResults.Length; j++) { FailureMechanismSectionAssemblyGroup expectedGroup = FailureMechanismSectionAssemblyGroupConverter.ConvertTo( ((FailureMechanismSectionWithCategory) failureMechanismResults[j].Sections.ElementAt(i)).Category); - Assert.AreEqual(expectedGroup, actualCombinedFailureMechanismSectionAssembly.FailureMechanismAssemblyGroupResults.ElementAt(j)); + Assert.AreEqual(expectedGroup, actualCombinedFailureMechanismSectionAssembly.FailureMechanismSectionAssemblyGroupResults.ElementAt(j)); } } } Index: Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResultFactory.cs =================================================================== diff -u -r89039d4a60d80904883f2ea76f98108595a9accf -rae9d949883292cdf4d7fb5dd9c21313d43cbd3ca --- Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResultFactory.cs (.../CombinedFailureMechanismSectionAssemblyResultFactory.cs) (revision 89039d4a60d80904883f2ea76f98108595a9accf) +++ Riskeer/Integration/src/Riskeer.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResultFactory.cs (.../CombinedFailureMechanismSectionAssemblyResultFactory.cs) (revision ae9d949883292cdf4d7fb5dd9c21313d43cbd3ca) @@ -65,7 +65,7 @@ assembly.Section.SectionStart, assembly.Section.SectionEnd, assembly.Section.AssemblyGroup, - CreateFailureMechanismResults(assembly.FailureMechanismAssemblyGroupResults, + CreateFailureMechanismResults(assembly.FailureMechanismSectionAssemblyGroupResults, failureMechanisms, assessmentSection))) .ToArray(); } Index: Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs =================================================================== diff -u -r89039d4a60d80904883f2ea76f98108595a9accf -rae9d949883292cdf4d7fb5dd9c21313d43cbd3ca --- Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs (.../CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs) (revision 89039d4a60d80904883f2ea76f98108595a9accf) +++ Riskeer/Integration/test/Riskeer.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs (.../CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs) (revision ae9d949883292cdf4d7fb5dd9c21313d43cbd3ca) @@ -113,21 +113,21 @@ Assert.AreEqual(output[i].Section.SectionEnd, results[i].SectionEnd); Assert.AreEqual(output[i].Section.AssemblyGroup, results[i].TotalResult); - Assert.AreEqual(output[i].FailureMechanismAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.Piping]), results[i].Piping); - Assert.AreEqual(output[i].FailureMechanismAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.GrassCoverErosionInwards]), results[i].GrassCoverErosionInwards); - Assert.AreEqual(output[i].FailureMechanismAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.MacroStabilityInwards]), results[i].MacroStabilityInwards); - Assert.AreEqual(output[i].FailureMechanismAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.Microstability]), results[i].Microstability); - Assert.AreEqual(output[i].FailureMechanismAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.StabilityStoneCover]), results[i].StabilityStoneCover); - Assert.AreEqual(output[i].FailureMechanismAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.WaveImpactAsphaltCover]), results[i].WaveImpactAsphaltCover); - Assert.AreEqual(output[i].FailureMechanismAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.WaterPressureAsphaltCover]), results[i].WaterPressureAsphaltCover); - Assert.AreEqual(output[i].FailureMechanismAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.GrassCoverErosionOutwards]), results[i].GrassCoverErosionOutwards); - Assert.AreEqual(output[i].FailureMechanismAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.GrassCoverSlipOffOutwards]), results[i].GrassCoverSlipOffOutwards); - Assert.AreEqual(output[i].FailureMechanismAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.GrassCoverSlipOffInwards]), results[i].GrassCoverSlipOffInwards); - Assert.AreEqual(output[i].FailureMechanismAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.HeightStructures]), results[i].HeightStructures); - Assert.AreEqual(output[i].FailureMechanismAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.ClosingStructures]), results[i].ClosingStructures); - Assert.AreEqual(output[i].FailureMechanismAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.PipingStructure]), results[i].PipingStructure); - Assert.AreEqual(output[i].FailureMechanismAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.StabilityPointStructures]), results[i].StabilityPointStructures); - Assert.AreEqual(output[i].FailureMechanismAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.DuneErosion]), results[i].DuneErosion); + Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.Piping]), results[i].Piping); + Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.GrassCoverErosionInwards]), results[i].GrassCoverErosionInwards); + Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.MacroStabilityInwards]), results[i].MacroStabilityInwards); + Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.Microstability]), results[i].Microstability); + Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.StabilityStoneCover]), results[i].StabilityStoneCover); + Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.WaveImpactAsphaltCover]), results[i].WaveImpactAsphaltCover); + Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.WaterPressureAsphaltCover]), results[i].WaterPressureAsphaltCover); + Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.GrassCoverErosionOutwards]), results[i].GrassCoverErosionOutwards); + Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.GrassCoverSlipOffOutwards]), results[i].GrassCoverSlipOffOutwards); + Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.GrassCoverSlipOffInwards]), results[i].GrassCoverSlipOffInwards); + Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.HeightStructures]), results[i].HeightStructures); + Assert.AreEqual(output[i].FailureMechanismSectionAssemblyGroupResults.ElementAt(failureMechanisms[assessmentSection.ClosingStructures]), results[i].ClosingStructures); + 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); } }