Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableCombinedSectionAssemblyCollection.cs =================================================================== diff -u -r6764bbce511e1295e4ec857488cba59f1b11d49b -r56c8a2399c8a7006b84a36019af1e37dd639bca4 --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableCombinedSectionAssemblyCollection.cs (.../ExportableCombinedSectionAssemblyCollection.cs) (revision 6764bbce511e1295e4ec857488cba59f1b11d49b) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableCombinedSectionAssemblyCollection.cs (.../ExportableCombinedSectionAssemblyCollection.cs) (revision 56c8a2399c8a7006b84a36019af1e37dd639bca4) @@ -49,16 +49,10 @@ throw new ArgumentNullException(nameof(combinedSectionAssemblyResults)); } - Sections = sections; CombinedSectionAssemblyResults = combinedSectionAssemblyResults; } /// - /// Gets the sections belonging to this collection of . - /// - public IEnumerable Sections { get; } - - /// /// Gets the collection of . /// public IEnumerable CombinedSectionAssemblyResults { get; } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableCombinedSectionAssemblyCollectionTest.cs =================================================================== diff -u -r6764bbce511e1295e4ec857488cba59f1b11d49b -r56c8a2399c8a7006b84a36019af1e37dd639bca4 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableCombinedSectionAssemblyCollectionTest.cs (.../ExportableCombinedSectionAssemblyCollectionTest.cs) (revision 6764bbce511e1295e4ec857488cba59f1b11d49b) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableCombinedSectionAssemblyCollectionTest.cs (.../ExportableCombinedSectionAssemblyCollectionTest.cs) (revision 56c8a2399c8a7006b84a36019af1e37dd639bca4) @@ -65,7 +65,6 @@ var assembly = new ExportableCombinedSectionAssemblyCollection(sections, combinedSectionAssemblyResults); // Assert - Assert.AreSame(sections, assembly.Sections); Assert.AreSame(combinedSectionAssemblyResults, assembly.CombinedSectionAssemblyResults); } } Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs =================================================================== diff -u -r32569b8b17f24007bc536331d8988d9369a661d4 -r56c8a2399c8a7006b84a36019af1e37dd639bca4 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs) (revision 32569b8b17f24007bc536331d8988d9369a661d4) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Creators/AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs (.../AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreatorTest.cs) (revision 56c8a2399c8a7006b84a36019af1e37dd639bca4) @@ -107,9 +107,6 @@ var idGenerator = new UniqueIdentifierGenerator(); SerializableTotalAssemblyResult totalAssemblyResult = CreateSerializableTotalAssembly("totalAssemblyResultId"); - // Precondition - Assert.AreEqual(exportableCombinedSectionAssemblyCollection.Sections.Count(), exportableCombinedSectionAssemblyCollection.CombinedSectionAssemblyResults.Count()); - // Call AggregatedSerializableCombinedFailureMechanismSectionAssemblies aggregate = AggregatedSerializableCombinedFailureMechanismSectionAssembliesCreator.Create(idGenerator, @@ -138,7 +135,8 @@ IEnumerable serializableFailureMechanismSections, IEnumerable serializableFailureMechanismSectionAssemblies) { - IEnumerable expectedSections = expectedCombinedSectionAssemblyCollection.Sections; + IEnumerable expectedSections = expectedCombinedSectionAssemblyCollection.CombinedSectionAssemblyResults + .Select(csar => csar.Section); int expectedNrOfSections = expectedSections.Count(); Assert.AreEqual(expectedNrOfSections, serializableFailureMechanismSections.Count()); Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs =================================================================== diff -u -r68318584c702cb11e38cd84a31d18c951595dda0 -r56c8a2399c8a7006b84a36019af1e37dd639bca4 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 68318584c702cb11e38cd84a31d18c951595dda0) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs (.../ExportableAssessmentSectionFactoryTest.cs) (revision 56c8a2399c8a7006b84a36019af1e37dd639bca4) @@ -145,21 +145,13 @@ failureMechanismAssemblyCalculator, assessmentSection); - AssertCombinedFailureMechanismSectionAssemblyResults(AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection), - exportableAssessmentSection.CombinedSectionAssemblyResults); + int expectedNrOfSections = AssessmentSectionAssemblyFactory.AssembleCombinedPerFailureMechanismSection(assessmentSection).Count(); + Assert.AreEqual(expectedNrOfSections, exportableAssessmentSection.CombinedSectionAssemblyResults.CombinedSectionAssemblyResults.Count()); } } #region TestHelper CombinedFailureMechanismSection - private static void AssertCombinedFailureMechanismSectionAssemblyResults(IEnumerable expectedSections, - ExportableCombinedSectionAssemblyCollection collection) - { - int expectedNrOfSections = expectedSections.Count(); - Assert.AreEqual(expectedNrOfSections, collection.Sections.Count()); - Assert.AreEqual(expectedNrOfSections, collection.CombinedSectionAssemblyResults.Count()); - } - #endregion #region TestHelpers FailureMechanismsWithProbability Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyCollectionFactoryTest.cs =================================================================== diff -u -rb4a67b942bd7fd1c4bbbc1a257e1573b33af9b4e -r56c8a2399c8a7006b84a36019af1e37dd639bca4 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyCollectionFactoryTest.cs (.../ExportableCombinedSectionAssemblyCollectionFactoryTest.cs) (revision b4a67b942bd7fd1c4bbbc1a257e1573b33af9b4e) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyCollectionFactoryTest.cs (.../ExportableCombinedSectionAssemblyCollectionFactoryTest.cs) (revision 56c8a2399c8a7006b84a36019af1e37dd639bca4) @@ -119,17 +119,15 @@ ReferenceLine referenceLine) { int expectedNrOfSections = expectedSections.Count(); - Assert.AreEqual(expectedNrOfSections, collection.Sections.Count()); Assert.AreEqual(expectedNrOfSections, collection.CombinedSectionAssemblyResults.Count()); for (var i = 0; i < expectedNrOfSections; i++) { CombinedFailureMechanismSectionAssemblyResult expectedSection = expectedSections.ElementAt(i); - ExportableCombinedFailureMechanismSection actualSection = collection.Sections.ElementAt(i); ExportableCombinedSectionAssembly actualSectionResult = collection.CombinedSectionAssemblyResults.ElementAt(i); - AssertExportableCombinedFailureMechanismSection(expectedSection, actualSection, referenceLine); - AssertExportableCombinedFailureMechanismSectionResult(actualSectionResult, actualSection, expectedSection); + AssertExportableCombinedFailureMechanismSection(expectedSection, actualSectionResult.Section, referenceLine); + AssertExportableCombinedFailureMechanismSectionResult(actualSectionResult, actualSectionResult.Section, expectedSection); } }