Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs =================================================================== diff -u -r374efe50d0e77c3cb586d5990e296b41fea97e40 -r82677f34a19358f3fd29d731f416fe12ea3e96ba --- Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs (.../AssessmentSectionAssemblyFactory.cs) (revision 374efe50d0e77c3cb586d5990e296b41fea97e40) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/AssessmentSectionAssemblyFactory.cs (.../AssessmentSectionAssemblyFactory.cs) (revision 82677f34a19358f3fd29d731f416fe12ea3e96ba) @@ -136,6 +136,16 @@ } } + /// + /// Assembles the combined failure mechanism sections. + /// + /// The assessment section that contains all + /// the failure mechanism sections to assemble. + /// A collection of . + /// /// Thrown when + /// is null. + /// Thrown when a + /// cannot be created. public static IEnumerable AssembleCombinedPerFailureMechanismSection(AssessmentSection assessmentSection) { if (assessmentSection == null) Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs =================================================================== diff -u -rb6e702538afcbc012fccd0df2e5759abc33902ce -r82677f34a19358f3fd29d731f416fe12ea3e96ba --- Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs (.../CombinedAssemblyFailureMechanismSectionFactory.cs) (revision b6e702538afcbc012fccd0df2e5759abc33902ce) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/CombinedAssemblyFailureMechanismSectionFactory.cs (.../CombinedAssemblyFailureMechanismSectionFactory.cs) (revision 82677f34a19358f3fd29d731f416fe12ea3e96ba) @@ -79,136 +79,119 @@ if (failureMechanisms.Contains(grassCoverErosionInwardsFailureMechanism)) { inputs.Add(CreateCombinedSections(grassCoverErosionInwardsFailureMechanism.SectionResults, - assessmentSection, GrassCoverErosionInwardsAssemblyFunc) - .ToArray()); + assessmentSection, GrassCoverErosionInwardsAssemblyFunc)); } MacroStabilityInwardsFailureMechanism macroStabilityInwardsFailureMechanism = assessmentSection.MacroStabilityInwards; if (failureMechanisms.Contains(macroStabilityInwardsFailureMechanism)) { inputs.Add(CreateCombinedSections(macroStabilityInwardsFailureMechanism.SectionResults, - assessmentSection, MacroStabilityInwardsAssemblyFunc) - .ToArray()); + assessmentSection, MacroStabilityInwardsAssemblyFunc)); } MacroStabilityOutwardsFailureMechanism macroStabilityOutwardsFailureMechanism = assessmentSection.MacroStabilityOutwards; if (failureMechanisms.Contains(macroStabilityOutwardsFailureMechanism)) { inputs.Add(CreateCombinedSections(macroStabilityOutwardsFailureMechanism.SectionResults, - assessmentSection, MacroStabilityOutwardsAssemblyFunc) - .ToArray()); + assessmentSection, MacroStabilityOutwardsAssemblyFunc)); } MicrostabilityFailureMechanism microstabilityFailureMechanism = assessmentSection.Microstability; if (failureMechanisms.Contains(microstabilityFailureMechanism)) { inputs.Add(CreateCombinedSections(microstabilityFailureMechanism.SectionResults, - MicrostabilityAssemblyFunc) - .ToArray()); + MicrostabilityAssemblyFunc)); } StabilityStoneCoverFailureMechanism stabilityStoneCoverFailureMechanism = assessmentSection.StabilityStoneCover; if (failureMechanisms.Contains(stabilityStoneCoverFailureMechanism)) { inputs.Add(CreateCombinedSections(stabilityStoneCoverFailureMechanism.SectionResults, - StabilityStoneCoverAssemblyFunc) - .ToArray()); + StabilityStoneCoverAssemblyFunc)); } WaveImpactAsphaltCoverFailureMechanism waveImpactAsphaltCoverFailureMechanism = assessmentSection.WaveImpactAsphaltCover; if (failureMechanisms.Contains(waveImpactAsphaltCoverFailureMechanism)) { inputs.Add(CreateCombinedSections(waveImpactAsphaltCoverFailureMechanism.SectionResults, - WaveImpactAsphaltCoverAssemblyFunc) - .ToArray()); + WaveImpactAsphaltCoverAssemblyFunc)); } WaterPressureAsphaltCoverFailureMechanism waterPressureAsphaltCoverFailureMechanism = assessmentSection.WaterPressureAsphaltCover; if (failureMechanisms.Contains(waterPressureAsphaltCoverFailureMechanism)) { inputs.Add(CreateCombinedSections(waterPressureAsphaltCoverFailureMechanism.SectionResults, - WaterPressureAsphaltCoverAssemblyFunc) - .ToArray()); + WaterPressureAsphaltCoverAssemblyFunc)); } GrassCoverErosionOutwardsFailureMechanism grassCoverErosionOutwardsFailureMechanism = assessmentSection.GrassCoverErosionOutwards; if (failureMechanisms.Contains(grassCoverErosionOutwardsFailureMechanism)) { inputs.Add(CreateCombinedSections(grassCoverErosionOutwardsFailureMechanism.SectionResults, - GrassCoverErosionOutwardsAssemblyFunc) - .ToArray()); + GrassCoverErosionOutwardsAssemblyFunc)); } GrassCoverSlipOffOutwardsFailureMechanism grassCoverSlipOffOutwardsFailureMechanism = assessmentSection.GrassCoverSlipOffOutwards; if (failureMechanisms.Contains(grassCoverSlipOffOutwardsFailureMechanism)) { inputs.Add(CreateCombinedSections(grassCoverSlipOffOutwardsFailureMechanism.SectionResults, - GrassCoverSlipOffOutwardsAssemblyFunc) - .ToArray()); + GrassCoverSlipOffOutwardsAssemblyFunc)); } GrassCoverSlipOffInwardsFailureMechanism grassCoverSlipOffInwardsFailureMechanism = assessmentSection.GrassCoverSlipOffInwards; if (failureMechanisms.Contains(grassCoverSlipOffOutwardsFailureMechanism)) { inputs.Add(CreateCombinedSections(grassCoverSlipOffInwardsFailureMechanism.SectionResults, - GrassCoverSlipOffInwardsAssemblyFunc) - .ToArray()); + GrassCoverSlipOffInwardsAssemblyFunc)); } HeightStructuresFailureMechanism heightStructuresFailureMechanism = assessmentSection.HeightStructures; if (failureMechanisms.Contains(heightStructuresFailureMechanism)) { inputs.Add(CreateCombinedSections(heightStructuresFailureMechanism.SectionResults, - assessmentSection, HeightStructuresAssemblyFunc) - .ToArray()); + assessmentSection, HeightStructuresAssemblyFunc)); } ClosingStructuresFailureMechanism closingStructuresFailureMechanism = assessmentSection.ClosingStructures; - if (failureMechanisms.Contains(heightStructuresFailureMechanism)) + if (failureMechanisms.Contains(closingStructuresFailureMechanism)) { inputs.Add(CreateCombinedSections(closingStructuresFailureMechanism.SectionResults, - assessmentSection, ClosingStructuresAssemblyFunc) - .ToArray()); + assessmentSection, ClosingStructuresAssemblyFunc)); } PipingStructureFailureMechanism pipingStructureFailureMechanism = assessmentSection.PipingStructure; if (failureMechanisms.Contains(pipingStructureFailureMechanism)) { inputs.Add(CreateCombinedSections(pipingStructureFailureMechanism.SectionResults, - PipingStructureAssemblyFunc) - .ToArray()); + PipingStructureAssemblyFunc)); } StabilityPointStructuresFailureMechanism stabilityPointStructuresFailureMechanism = assessmentSection.StabilityPointStructures; if (failureMechanisms.Contains(stabilityPointStructuresFailureMechanism)) { inputs.Add(CreateCombinedSections(stabilityPointStructuresFailureMechanism.SectionResults, - assessmentSection, StabilityPointStructuresAssemblyFunc) - .ToArray()); + assessmentSection, StabilityPointStructuresAssemblyFunc)); } StrengthStabilityLengthwiseConstructionFailureMechanism strengthStabilityLengthwiseConstructionFailureMechanism = assessmentSection.StrengthStabilityLengthwiseConstruction; if (failureMechanisms.Contains(strengthStabilityLengthwiseConstructionFailureMechanism)) { inputs.Add(CreateCombinedSections(strengthStabilityLengthwiseConstructionFailureMechanism.SectionResults, - StrengthStabilityLengthwiseConstructionAssemblyFunc) - .ToArray()); + StrengthStabilityLengthwiseConstructionAssemblyFunc)); } DuneErosionFailureMechanism duneErosionFailureMechanism = assessmentSection.DuneErosion; if (failureMechanisms.Contains(duneErosionFailureMechanism)) { inputs.Add(CreateCombinedSections(duneErosionFailureMechanism.SectionResults, - DuneErosionAssemblyFunc) - .ToArray()); + DuneErosionAssemblyFunc)); } TechnicalInnovationFailureMechanism technicalInnovationFailureMechanism = assessmentSection.TechnicalInnovation; if (failureMechanisms.Contains(technicalInnovationFailureMechanism)) { inputs.Add(CreateCombinedSections(technicalInnovationFailureMechanism.SectionResults, - TechnicalInnovationAssemblyFunc) - .ToArray()); + TechnicalInnovationAssemblyFunc)); } return inputs; @@ -222,7 +205,12 @@ { double totalSectionsLength = 0; - return sectionResults.Select(sectionResult => CreateSection(sectionResult, getAssemblyFunc(sectionResult, assessmentSection), ref totalSectionsLength)) + return sectionResults.Select(sectionResult => + { + CombinedAssemblyFailureMechanismSection section = CreateSection(sectionResult, getAssemblyFunc(sectionResult, assessmentSection), totalSectionsLength); + totalSectionsLength = section.SectionEnd; + return section; + }) .ToArray(); } @@ -233,19 +221,22 @@ { double totalSectionsLength = 0; - return sectionResults.Select(sectionResult => CreateSection(sectionResult, getAssemblyFunc(sectionResult), ref totalSectionsLength)) + return sectionResults.Select(sectionResult => + { + CombinedAssemblyFailureMechanismSection section = CreateSection(sectionResult, getAssemblyFunc(sectionResult), totalSectionsLength); + totalSectionsLength = section.SectionEnd; + return section; + }) .ToArray(); } private static CombinedAssemblyFailureMechanismSection CreateSection( TFailureMechanismSectionResult sectionResult, FailureMechanismSectionAssemblyCategoryGroup assemblyCategoryGroup, - ref double sectionStart) + double sectionStart) where TFailureMechanismSectionResult : FailureMechanismSectionResult { double sectionEnd = sectionResult.Section.Length + sectionStart; - var section = new CombinedAssemblyFailureMechanismSection(sectionStart, sectionEnd, assemblyCategoryGroup); - sectionStart = sectionEnd; - return section; + return new CombinedAssemblyFailureMechanismSection(sectionStart, sectionEnd, assemblyCategoryGroup); } #region Assembly Funcs Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResult.cs =================================================================== diff -u -r31f41aab181d3009551b8568e4d5f734199de0cf -r82677f34a19358f3fd29d731f416fe12ea3e96ba --- Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResult.cs (.../CombinedFailureMechanismSectionAssemblyResult.cs) (revision 31f41aab181d3009551b8568e4d5f734199de0cf) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResult.cs (.../CombinedFailureMechanismSectionAssemblyResult.cs) (revision 82677f34a19358f3fd29d731f416fe12ea3e96ba) @@ -68,7 +68,7 @@ ClosingStructures = properties.ClosingStructures; PipingStructure = properties.PipingStructure; StabilityPointStructures = properties.StabilityPointStructures; - StrengthStabilityLengthwise = properties.StrengthStabilityLengthwise; + StrengthStabilityLengthwiseConstruction = properties.StrengthStabilityLengthwiseConstruction; DuneErosion = properties.DuneErosion; TechnicalInnovation = properties.TechnicalInnovation; } @@ -166,9 +166,9 @@ public FailureMechanismSectionAssemblyCategoryGroup StabilityPointStructures { get; } /// - /// Gets the assembly result for strength stability lengthwise. + /// Gets the assembly result for strength stability lengthwise construction. /// - public FailureMechanismSectionAssemblyCategoryGroup StrengthStabilityLengthwise { get; } + public FailureMechanismSectionAssemblyCategoryGroup StrengthStabilityLengthwiseConstruction { get; } /// /// Gets the assembly result for dune erosion. @@ -205,7 +205,7 @@ ClosingStructures = FailureMechanismSectionAssemblyCategoryGroup.None; PipingStructure = FailureMechanismSectionAssemblyCategoryGroup.None; StabilityPointStructures = FailureMechanismSectionAssemblyCategoryGroup.None; - StrengthStabilityLengthwise = FailureMechanismSectionAssemblyCategoryGroup.None; + StrengthStabilityLengthwiseConstruction = FailureMechanismSectionAssemblyCategoryGroup.None; DuneErosion = FailureMechanismSectionAssemblyCategoryGroup.None; TechnicalInnovation = FailureMechanismSectionAssemblyCategoryGroup.None; } @@ -286,9 +286,9 @@ public FailureMechanismSectionAssemblyCategoryGroup StabilityPointStructures { internal get; set; } /// - /// Gets or sets the assembly result for strength stability lengthwise. + /// Gets or sets the assembly result for strength stability lengthwise construction. /// - public FailureMechanismSectionAssemblyCategoryGroup StrengthStabilityLengthwise { internal get; set; } + public FailureMechanismSectionAssemblyCategoryGroup StrengthStabilityLengthwiseConstruction { internal get; set; } /// /// Gets or sets the assembly result for dune erosion. Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResultFactory.cs =================================================================== diff -u -r31f41aab181d3009551b8568e4d5f734199de0cf -r82677f34a19358f3fd29d731f416fe12ea3e96ba --- Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResultFactory.cs (.../CombinedFailureMechanismSectionAssemblyResultFactory.cs) (revision 31f41aab181d3009551b8568e4d5f734199de0cf) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Assembly/CombinedFailureMechanismSectionAssemblyResultFactory.cs (.../CombinedFailureMechanismSectionAssemblyResultFactory.cs) (revision 82677f34a19358f3fd29d731f416fe12ea3e96ba) @@ -121,7 +121,7 @@ StabilityPointStructures = failureMechanisms.ContainsKey(assessmentSection.StabilityPointStructures) ? failureMechanismResults.ElementAt(failureMechanisms[assessmentSection.StabilityPointStructures]) : FailureMechanismSectionAssemblyCategoryGroup.NotApplicable, - StrengthStabilityLengthwise = failureMechanisms.ContainsKey(assessmentSection.StrengthStabilityLengthwiseConstruction) + StrengthStabilityLengthwiseConstruction = failureMechanisms.ContainsKey(assessmentSection.StrengthStabilityLengthwiseConstruction) ? failureMechanismResults.ElementAt(failureMechanisms[assessmentSection.StrengthStabilityLengthwiseConstruction]) : FailureMechanismSectionAssemblyCategoryGroup.NotApplicable, DuneErosion = failureMechanisms.ContainsKey(assessmentSection.DuneErosion) Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs =================================================================== diff -u -r31f41aab181d3009551b8568e4d5f734199de0cf -r82677f34a19358f3fd29d731f416fe12ea3e96ba --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs (.../CombinedFailureMechanismSectionAssemblyResultRow.cs) (revision 31f41aab181d3009551b8568e4d5f734199de0cf) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/CombinedFailureMechanismSectionAssemblyResultRow.cs (.../CombinedFailureMechanismSectionAssemblyResultRow.cs) (revision 82677f34a19358f3fd29d731f416fe12ea3e96ba) @@ -286,7 +286,7 @@ { get { - return FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(combinedFailureMechanismSectionAssemblyResult.StrengthStabilityLengthwise); + return FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(combinedFailureMechanismSectionAssemblyResult.StrengthStabilityLengthwiseConstruction); } } @@ -363,7 +363,7 @@ ColumnStateDefinitions[closingStructuresIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.ClosingStructures); ColumnStateDefinitions[pipingStructureIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.PipingStructure); ColumnStateDefinitions[stabilityPointStructuresIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.StabilityPointStructures); - ColumnStateDefinitions[strengthStabilityLengthwiseIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.StrengthStabilityLengthwise); + ColumnStateDefinitions[strengthStabilityLengthwiseIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.StrengthStabilityLengthwiseConstruction); ColumnStateDefinitions[duneErosionIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.DuneErosion); ColumnStateDefinitions[technicalInnovationIndex].Style = CreateCellStyle(combinedFailureMechanismSectionAssemblyResult.TechnicalInnovation); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs =================================================================== diff -u -r86d4e6d30a0f372f05289ed4c20f9b2436a587aa -r82677f34a19358f3fd29d731f416fe12ea3e96ba --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision 86d4e6d30a0f372f05289ed4c20f9b2436a587aa) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Assembly/AssessmentSectionAssemblyFactoryTest.cs (.../AssessmentSectionAssemblyFactoryTest.cs) (revision 82677f34a19358f3fd29d731f416fe12ea3e96ba) @@ -390,7 +390,7 @@ Assert.AreEqual(expectedOutput[i].ClosingStructures, output[i].ClosingStructures); Assert.AreEqual(expectedOutput[i].PipingStructure, output[i].PipingStructure); Assert.AreEqual(expectedOutput[i].StabilityPointStructures, output[i].StabilityPointStructures); - Assert.AreEqual(expectedOutput[i].StrengthStabilityLengthwise, output[i].StrengthStabilityLengthwise); + Assert.AreEqual(expectedOutput[i].StrengthStabilityLengthwiseConstruction, output[i].StrengthStabilityLengthwiseConstruction); Assert.AreEqual(expectedOutput[i].DuneErosion, output[i].DuneErosion); Assert.AreEqual(expectedOutput[i].TechnicalInnovation, output[i].TechnicalInnovation); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs =================================================================== diff -u -r31f41aab181d3009551b8568e4d5f734199de0cf -r82677f34a19358f3fd29d731f416fe12ea3e96ba --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs (.../CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs) (revision 31f41aab181d3009551b8568e4d5f734199de0cf) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs (.../CombinedFailureMechanismSectionAssemblyResultFactoryTest.cs) (revision 82677f34a19358f3fd29d731f416fe12ea3e96ba) @@ -124,7 +124,7 @@ Assert.AreEqual(output[i].FailureMechanismResults.ElementAt(failureMechanisms[assessmentSection.ClosingStructures]), results[i].ClosingStructures); Assert.AreEqual(output[i].FailureMechanismResults.ElementAt(failureMechanisms[assessmentSection.PipingStructure]), results[i].PipingStructure); Assert.AreEqual(output[i].FailureMechanismResults.ElementAt(failureMechanisms[assessmentSection.StabilityPointStructures]), results[i].StabilityPointStructures); - Assert.AreEqual(output[i].FailureMechanismResults.ElementAt(failureMechanisms[assessmentSection.StrengthStabilityLengthwiseConstruction]), results[i].StrengthStabilityLengthwise); + Assert.AreEqual(output[i].FailureMechanismResults.ElementAt(failureMechanisms[assessmentSection.StrengthStabilityLengthwiseConstruction]), results[i].StrengthStabilityLengthwiseConstruction); Assert.AreEqual(output[i].FailureMechanismResults.ElementAt(failureMechanisms[assessmentSection.DuneErosion]), results[i].DuneErosion); Assert.AreEqual(output[i].FailureMechanismResults.ElementAt(failureMechanisms[assessmentSection.TechnicalInnovation]), results[i].TechnicalInnovation); } @@ -181,7 +181,7 @@ Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.NotApplicable, results[i].ClosingStructures); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.NotApplicable, results[i].PipingStructure); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.NotApplicable, results[i].StabilityPointStructures); - Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.NotApplicable, results[i].StrengthStabilityLengthwise); + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.NotApplicable, results[i].StrengthStabilityLengthwiseConstruction); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.NotApplicable, results[i].DuneErosion); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.NotApplicable, results[i].TechnicalInnovation); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultTest.cs =================================================================== diff -u -rf240aa827e5fb4876c0e80fe113f239ff7a2c589 -r82677f34a19358f3fd29d731f416fe12ea3e96ba --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultTest.cs (.../CombinedFailureMechanismSectionAssemblyResultTest.cs) (revision f240aa827e5fb4876c0e80fe113f239ff7a2c589) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Assembly/CombinedFailureMechanismSectionAssemblyResultTest.cs (.../CombinedFailureMechanismSectionAssemblyResultTest.cs) (revision 82677f34a19358f3fd29d731f416fe12ea3e96ba) @@ -77,7 +77,7 @@ Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.ClosingStructures); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.PipingStructure); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.StabilityPointStructures); - Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.StrengthStabilityLengthwise); + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.StrengthStabilityLengthwiseConstruction); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.DuneErosion); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroup.None, result.TechnicalInnovation); } @@ -128,7 +128,7 @@ ClosingStructures = closingStructuresResult, PipingStructure = pipingStructureResult, StabilityPointStructures = stabilityPointStructuresResult, - StrengthStabilityLengthwise = strengthStabilityLengthwiseResult, + StrengthStabilityLengthwiseConstruction = strengthStabilityLengthwiseResult, DuneErosion = duneErosionResult, TechnicalInnovation = technicalInnovationResult }); @@ -152,7 +152,7 @@ Assert.AreEqual(closingStructuresResult, result.ClosingStructures); Assert.AreEqual(pipingStructureResult, result.PipingStructure); Assert.AreEqual(stabilityPointStructuresResult, result.StabilityPointStructures); - Assert.AreEqual(strengthStabilityLengthwiseResult, result.StrengthStabilityLengthwise); + Assert.AreEqual(strengthStabilityLengthwiseResult, result.StrengthStabilityLengthwiseConstruction); Assert.AreEqual(duneErosionResult, result.DuneErosion); Assert.AreEqual(technicalInnovationResult, result.TechnicalInnovation); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs =================================================================== diff -u -rf240aa827e5fb4876c0e80fe113f239ff7a2c589 -r82677f34a19358f3fd29d731f416fe12ea3e96ba --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs (.../CombinedFailureMechanismSectionAssemblyResultRowTest.cs) (revision f240aa827e5fb4876c0e80fe113f239ff7a2c589) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/CombinedFailureMechanismSectionAssemblyResultRowTest.cs (.../CombinedFailureMechanismSectionAssemblyResultRowTest.cs) (revision 82677f34a19358f3fd29d731f416fe12ea3e96ba) @@ -122,7 +122,7 @@ Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(result.ClosingStructures), row.ClosingStructures); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(result.PipingStructure), row.PipingStructure); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(result.StabilityPointStructures), row.StabilityPointStructures); - Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(result.StrengthStabilityLengthwise), row.StrengthStabilityLengthwise); + Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(result.StrengthStabilityLengthwiseConstruction), row.StrengthStabilityLengthwise); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(result.DuneErosion), row.DuneErosion); Assert.AreEqual(FailureMechanismSectionAssemblyCategoryGroupHelper.GetCategoryGroupDisplayname(result.TechnicalInnovation), row.TechnicalInnovation); } @@ -157,7 +157,7 @@ ClosingStructures = categoryGroup, PipingStructure = categoryGroup, StabilityPointStructures = categoryGroup, - StrengthStabilityLengthwise = categoryGroup, + StrengthStabilityLengthwiseConstruction = categoryGroup, DuneErosion = categoryGroup, TechnicalInnovation = categoryGroup }); @@ -213,7 +213,7 @@ ClosingStructures = random.NextEnumValue(), PipingStructure = random.NextEnumValue(), StabilityPointStructures = random.NextEnumValue(), - StrengthStabilityLengthwise = random.NextEnumValue(), + StrengthStabilityLengthwiseConstruction = random.NextEnumValue(), DuneErosion = random.NextEnumValue(), TechnicalInnovation = random.NextEnumValue() });