Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableFailureMechanism.cs =================================================================== diff -u -ra48bcdc9670ec7dc1da17ca73bb6fc1f287c39a1 -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableFailureMechanism.cs (.../ExportableFailureMechanism.cs) (revision a48bcdc9670ec7dc1da17ca73bb6fc1f287c39a1) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableFailureMechanism.cs (.../ExportableFailureMechanism.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -63,7 +63,6 @@ } FailureMechanismAssembly = failureMechanismAssembly; - Sections = sections; SectionAssemblyResults = sectionAssemblyResults; Code = code; Group = group; @@ -75,11 +74,6 @@ public TFailureMechanismAssemblyResult FailureMechanismAssembly { get; } /// - /// Gets the collection of sections. - /// - public IEnumerable Sections { get; } - - /// /// Gets the collection of assembly results. /// public IEnumerable SectionAssemblyResults { get; } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableFailureMechanismTest.cs =================================================================== diff -u -r3293cb26e7540dc2e61becd7eda453e234d30664 -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableFailureMechanismTest.cs (.../ExportableFailureMechanismTest.cs) (revision 3293cb26e7540dc2e61becd7eda453e234d30664) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableFailureMechanismTest.cs (.../ExportableFailureMechanismTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -109,7 +109,6 @@ // Assert Assert.AreSame(failureMechanismAssembly, failureMechanism.FailureMechanismAssembly); - Assert.AreSame(sections, failureMechanism.Sections); Assert.AreSame(sectionAssemblyResults, failureMechanism.SectionAssemblyResults); Assert.AreEqual(code, failureMechanism.Code); Assert.AreEqual(group, failureMechanism.Group); Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs =================================================================== diff -u -r1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs (.../AggregatedSerializableFailureMechanismCreatorTest.cs) (revision 1f5d1d319b9a4bf62f6271d02e2b556f1ad6843c) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableFailureMechanismCreatorTest.cs (.../AggregatedSerializableFailureMechanismCreatorTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -144,9 +144,6 @@ const string totalAssemblyId = "totalAssemblyId"; SerializableTotalAssemblyResult serializableTotalAssembly = CreateSerializableTotalAssembly(totalAssemblyId); - // Precondition - Assert.AreEqual(failureMechanism.Sections.Count(), failureMechanism.SectionAssemblyResults.Count()); - // Call AggregatedSerializableFailureMechanism aggregatedFailureMechanism = AggregatedSerializableFailureMechanismCreator.Create(idGenerator, serializableTotalAssembly, failureMechanism); @@ -278,9 +275,6 @@ const string totalAssemblyId = "totalAssemblyId"; SerializableTotalAssemblyResult serializableTotalAssembly = CreateSerializableTotalAssembly(totalAssemblyId); - // Precondition - Assert.AreEqual(failureMechanism.Sections.Count(), failureMechanism.SectionAssemblyResults.Count()); - // Call AggregatedSerializableFailureMechanism aggregatedFailureMechanism = AggregatedSerializableFailureMechanismCreator.Create(idGenerator, serializableTotalAssembly, failureMechanism); @@ -318,7 +312,7 @@ Action assertSectionAssemblyResultAction) where T : ExportableFailureMechanismAssemblyResult { - IEnumerable expectedSections = expectedFailureMechanism.Sections; + IEnumerable expectedSections = expectedFailureMechanism.SectionAssemblyResults.Select(sar => sar.FailureMechanismSection); int expectedNrOfSections = expectedSections.Count(); Assert.AreEqual(expectedNrOfSections, serializableFailureMechanismSections.Count()); Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs =================================================================== diff -u -ra56e1107988e0b552f2ba371935b967b34fdc332 -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision a56e1107988e0b552f2ba371935b967b34fdc332) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -223,7 +223,6 @@ Assert.AreEqual(expectedAssemblyOutput.Probability, exportableFailureMechanismAssemblyResult.Probability); Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssemblyResult.AssemblyMethod); - Assert.AreEqual(failureMechanism.Sections.Count(), actualExportableFailureMechanism.Sections.Count()); Assert.AreEqual(failureMechanism.SectionResults.Count(), actualExportableFailureMechanism.SectionAssemblyResults.Count()); } @@ -325,7 +324,6 @@ Assert.AreEqual(expectedAssemblyOutput, exportableFailureMechanismAssemblyResult.AssemblyCategory); Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssemblyResult.AssemblyMethod); - Assert.AreEqual(failureMechanism.Sections.Count(), actualExportableFailureMechanism.Sections.Count()); Assert.AreEqual(failureMechanism.SectionResults.Count(), actualExportableFailureMechanism.SectionAssemblyResults.Count()); } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableClosingStructuresFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableClosingStructuresFailureMechanismFactoryTest.cs (.../ExportableClosingStructuresFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableClosingStructuresFailureMechanismFactoryTest.cs (.../ExportableClosingStructuresFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -99,7 +99,6 @@ Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); Assert.AreEqual(0, failureMechanismAssemblyResult.Probability); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -133,12 +132,14 @@ Assert.AreEqual(calculatorOutput.Probability, exportableFailureMechanismAssembly.Probability); Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.TailorMadeAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.CombinedAssemblyOutput, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableDuneErosionFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableDuneErosionFailureMechanismFactoryTest.cs (.../ExportableDuneErosionFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableDuneErosionFailureMechanismFactoryTest.cs (.../ExportableDuneErosionFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -73,7 +73,6 @@ Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, failureMechanismAssemblyResult.AssemblyMethod); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -103,12 +102,13 @@ Assert.AreEqual(failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput, exportableFailureMechanismAssembly.AssemblyCategory); Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults.Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput.Group, failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyGroupOutput.Value, failureMechanismSectionAssemblyCalculator.TailorMadeAssemblyCategoryOutput.Value, failureMechanismSectionAssemblyCalculator.CombinedAssemblyCategoryOutput.Value, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableFailureMechanismFactoryTest.cs =================================================================== diff -u -ra48bcdc9670ec7dc1da17ca73bb6fc1f287c39a1 -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableFailureMechanismFactoryTest.cs (.../ExportableFailureMechanismFactoryTest.cs) (revision a48bcdc9670ec7dc1da17ca73bb6fc1f287c39a1) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableFailureMechanismFactoryTest.cs (.../ExportableFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -53,7 +53,6 @@ Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); Assert.AreEqual(0, failureMechanismAssemblyResult.Probability); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -78,7 +77,6 @@ Assert.AreEqual(assemblyMethod, failureMechanismAssemblyResult.AssemblyMethod); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverErosionInwardsFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -99,7 +99,6 @@ Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); Assert.AreEqual(0, failureMechanismAssemblyResult.Probability); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -133,12 +132,14 @@ Assert.AreEqual(calculatorOutput.Probability, exportableFailureMechanismAssembly.Probability); Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.TailorMadeAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.CombinedAssemblyOutput, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverErosionOutwardsFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -73,7 +73,6 @@ Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, failureMechanismAssemblyResult.AssemblyMethod); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -103,12 +102,14 @@ Assert.AreEqual(failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput, exportableFailureMechanismAssembly.AssemblyCategory); Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput.Group, failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyGroupOutput.Value, failureMechanismSectionAssemblyCalculator.TailorMadeAssemblyCategoryOutput.Value, failureMechanismSectionAssemblyCalculator.CombinedAssemblyCategoryOutput.Value, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverSlipOffInwardsFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -73,7 +73,6 @@ Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, failureMechanismAssemblyResult.AssemblyMethod); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -103,12 +102,14 @@ Assert.AreEqual(failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput, exportableFailureMechanismAssembly.AssemblyCategory); Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput.Group, failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyGroupOutput.Value, failureMechanismSectionAssemblyCalculator.TailorMadeAssemblyCategoryOutput.Value, failureMechanismSectionAssemblyCalculator.CombinedAssemblyCategoryOutput.Value, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs (.../ExportableGrassCoverSlipOffOutwardsFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -73,7 +73,6 @@ Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, failureMechanismAssemblyResult.AssemblyMethod); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -103,12 +102,14 @@ Assert.AreEqual(failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput, exportableFailureMechanismAssembly.AssemblyCategory); Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput.Group, failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyGroupOutput.Value, failureMechanismSectionAssemblyCalculator.TailorMadeAssemblyCategoryOutput.Value, failureMechanismSectionAssemblyCalculator.CombinedAssemblyCategoryOutput.Value, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableHeightStructuresFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableHeightStructuresFailureMechanismFactoryTest.cs (.../ExportableHeightStructuresFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableHeightStructuresFailureMechanismFactoryTest.cs (.../ExportableHeightStructuresFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -99,7 +99,6 @@ Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); Assert.AreEqual(0, failureMechanismAssemblyResult.Probability); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -133,12 +132,14 @@ Assert.AreEqual(calculatorOutput.Probability, exportableFailureMechanismAssembly.Probability); Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.TailorMadeAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.CombinedAssemblyOutput, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs (.../ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs (.../ExportableMacroStabilityInwardsFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -99,7 +99,6 @@ Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); Assert.AreEqual(0, failureMechanismAssemblyResult.Probability); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -133,12 +132,14 @@ Assert.AreEqual(calculatorOutput.Group, exportableFailureMechanismAssembly.AssemblyCategory); Assert.AreEqual(calculatorOutput.Probability, exportableFailureMechanismAssembly.Probability); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.TailorMadeAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.CombinedAssemblyOutput, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMacroStabilityOutwardsFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMacroStabilityOutwardsFailureMechanismFactoryTest.cs (.../ExportableMacroStabilityOutwardsFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMacroStabilityOutwardsFailureMechanismFactoryTest.cs (.../ExportableMacroStabilityOutwardsFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -97,7 +97,6 @@ Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, failureMechanismAssemblyResult.AssemblyMethod); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -129,12 +128,14 @@ Assert.AreEqual(failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput, exportableFailureMechanismAssembly.AssemblyCategory); Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput.Group, failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyOutput.Group, failureMechanismSectionAssemblyCalculator.TailorMadeAssessmentAssemblyOutput.Group, failureMechanismSectionAssemblyCalculator.CombinedAssemblyCategoryOutput.Value, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMicrostabilityFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMicrostabilityFailureMechanismFactoryTest.cs (.../ExportableMicrostabilityFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableMicrostabilityFailureMechanismFactoryTest.cs (.../ExportableMicrostabilityFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -73,7 +73,6 @@ Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, failureMechanismAssemblyResult.AssemblyMethod); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -103,12 +102,14 @@ Assert.AreEqual(failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput, exportableFailureMechanismAssembly.AssemblyCategory); Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput.Group, failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyGroupOutput.Value, failureMechanismSectionAssemblyCalculator.TailorMadeAssemblyCategoryOutput.Value, failureMechanismSectionAssemblyCalculator.CombinedAssemblyCategoryOutput.Value, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs (.../ExportablePipingFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportablePipingFailureMechanismFactoryTest.cs (.../ExportablePipingFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -97,7 +97,6 @@ Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); Assert.AreEqual(0, failureMechanismAssemblyResult.Probability); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -131,12 +130,14 @@ Assert.AreEqual(calculatorOutput.Probability, exportableFailureMechanismAssembly.Probability); Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.TailorMadeAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.CombinedAssemblyOutput, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportablePipingStructureFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportablePipingStructureFailureMechanismFactoryTest.cs (.../ExportablePipingStructureFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportablePipingStructureFailureMechanismFactoryTest.cs (.../ExportablePipingStructureFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -73,7 +73,6 @@ Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, failureMechanismAssemblyResult.AssemblyMethod); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -103,12 +102,14 @@ Assert.AreEqual(failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput, exportableFailureMechanismAssembly.AssemblyCategory); Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput.Group, failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyGroupOutput.Value, failureMechanismSectionAssemblyCalculator.TailorMadeAssemblyCategoryOutput.Value, failureMechanismSectionAssemblyCalculator.CombinedAssemblyCategoryOutput.Value, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs (.../ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs (.../ExportableStabilityPointStructuresFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -99,7 +99,6 @@ Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); Assert.AreEqual(0, failureMechanismAssemblyResult.Probability); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -133,12 +132,14 @@ Assert.AreEqual(calculatorOutput.Probability, exportableFailureMechanismAssembly.Probability); Assert.AreEqual(ExportableAssemblyMethod.WBI1B1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.TailorMadeAssessmentAssemblyOutput, failureMechanismSectionAssemblyCalculator.CombinedAssemblyOutput, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs (.../ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs (.../ExportableStabilityStoneCoverFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -73,7 +73,6 @@ Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, failureMechanismAssemblyResult.AssemblyMethod); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -103,12 +102,14 @@ Assert.AreEqual(failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput, exportableFailureMechanismAssembly.AssemblyCategory); Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput.Group, failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyGroupOutput.Value, failureMechanismSectionAssemblyCalculator.TailorMadeAssemblyCategoryOutput.Value, failureMechanismSectionAssemblyCalculator.CombinedAssemblyCategoryOutput.Value, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactoryTest.cs (.../ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactoryTest.cs (.../ExportableStrengthStabilityLengthwiseConstructionFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -73,7 +73,6 @@ Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, failureMechanismAssemblyResult.AssemblyMethod); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -103,11 +102,13 @@ Assert.AreEqual(failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput, exportableFailureMechanismAssembly.AssemblyCategory); Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput.Group, failureMechanismSectionAssemblyCalculator.TailorMadeAssemblyCategoryOutput.Value, failureMechanismSectionAssemblyCalculator.CombinedAssemblyCategoryOutput.Value, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableTechnicalInnovationFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableTechnicalInnovationFailureMechanismFactoryTest.cs (.../ExportableTechnicalInnovationFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableTechnicalInnovationFailureMechanismFactoryTest.cs (.../ExportableTechnicalInnovationFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -73,7 +73,6 @@ Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, failureMechanismAssemblyResult.AssemblyMethod); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -103,11 +102,13 @@ Assert.AreEqual(failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput, exportableFailureMechanismAssembly.AssemblyCategory); Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput.Group, failureMechanismSectionAssemblyCalculator.TailorMadeAssemblyCategoryOutput.Value, failureMechanismSectionAssemblyCalculator.CombinedAssemblyCategoryOutput.Value, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs (.../ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs (.../ExportableWaterPressureAsphaltCoverFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -73,7 +73,6 @@ Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, failureMechanismAssemblyResult.AssemblyMethod); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -103,11 +102,13 @@ Assert.AreEqual(failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput, exportableFailureMechanismAssembly.AssemblyCategory); Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput.Group, failureMechanismSectionAssemblyCalculator.TailorMadeAssemblyCategoryOutput.Value, failureMechanismSectionAssemblyCalculator.CombinedAssemblyCategoryOutput.Value, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs =================================================================== diff -u -r6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a -r68318584c702cb11e38cd84a31d18c951595dda0 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs (.../ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs) (revision 6ae87d30b11c6c762b6bae4b5d2a20c313d6e50a) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs (.../ExportableWaveImpactAsphaltCoverFailureMechanismFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) @@ -73,7 +73,6 @@ Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, failureMechanismAssemblyResult.AssemblyMethod); Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.NotApplicable, failureMechanismAssemblyResult.AssemblyCategory); - CollectionAssert.IsEmpty(exportableFailureMechanism.Sections); CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } @@ -103,12 +102,14 @@ Assert.AreEqual(failureMechanismAssemblyCalculator.FailureMechanismAssemblyCategoryGroupOutput, exportableFailureMechanismAssembly.AssemblyCategory); Assert.AreEqual(ExportableAssemblyMethod.WBI1A1, exportableFailureMechanismAssembly.AssemblyMethod); - ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanism.Sections); + IEnumerable exportableFailureMechanismSections = exportableFailureMechanism.SectionAssemblyResults + .Select(sar => sar.FailureMechanismSection); + ExportableFailureMechanismSectionTestHelper.AssertExportableFailureMechanismSections(failureMechanism.Sections, exportableFailureMechanismSections); AssertExportableFailureMechanismSectionResults(failureMechanismSectionAssemblyCalculator.SimpleAssessmentAssemblyOutput.Group, failureMechanismSectionAssemblyCalculator.DetailedAssessmentAssemblyGroupOutput.Value, failureMechanismSectionAssemblyCalculator.TailorMadeAssemblyCategoryOutput.Value, failureMechanismSectionAssemblyCalculator.CombinedAssemblyCategoryOutput.Value, - exportableFailureMechanism.Sections, + exportableFailureMechanismSections, exportableFailureMechanism.SectionAssemblyResults.Cast()); } }