Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableCombinedSectionAssemblyCollectionFactory.cs =================================================================== diff -u -rd5874583519121e94ec4a9ad81381f0c197f06e6 -r82832b737256f4fb806ccbb1e601b63cc8dfa86c --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableCombinedSectionAssemblyCollectionFactory.cs (.../ExportableCombinedSectionAssemblyCollectionFactory.cs) (revision d5874583519121e94ec4a9ad81381f0c197f06e6) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableCombinedSectionAssemblyCollectionFactory.cs (.../ExportableCombinedSectionAssemblyCollectionFactory.cs) (revision 82832b737256f4fb806ccbb1e601b63cc8dfa86c) @@ -27,6 +27,7 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Integration.Data.Assembly; using Ringtoets.Integration.IO.Assembly; +using Ringtoets.Integration.IO.Helpers; namespace Ringtoets.Integration.IO.Factories { @@ -63,10 +64,12 @@ foreach (CombinedFailureMechanismSectionAssemblyResult assemblyResult in combinedSectionAssemblyResults) { - var exportableSection = new ExportableCombinedFailureMechanismSection(Enumerable.Empty(), - assemblyResult.SectionStart, - assemblyResult.SectionEnd, - ExportableAssemblyMethod.WBI3A1); + var exportableSection = new ExportableCombinedFailureMechanismSection( + ExportableFailureMechanismSectionHelper.GetFailureMechanismSectionGeometry( + referenceLine, assemblyResult.SectionStart, assemblyResult.SectionEnd), + assemblyResult.SectionStart, + assemblyResult.SectionEnd, + ExportableAssemblyMethod.WBI3A1); var exportableSectionResult = new ExportableCombinedSectionAssembly(exportableSection, new ExportableSectionAssemblyResult(ExportableAssemblyMethod.WBI3C1, Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyCollectionFactoryTest.cs =================================================================== diff -u -rd5874583519121e94ec4a9ad81381f0c197f06e6 -r82832b737256f4fb806ccbb1e601b63cc8dfa86c --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyCollectionFactoryTest.cs (.../ExportableCombinedSectionAssemblyCollectionFactoryTest.cs) (revision d5874583519121e94ec4a9ad81381f0c197f06e6) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableCombinedSectionAssemblyCollectionFactoryTest.cs (.../ExportableCombinedSectionAssemblyCollectionFactoryTest.cs) (revision 82832b737256f4fb806ccbb1e601b63cc8dfa86c) @@ -22,13 +22,15 @@ using System; using System.Collections.Generic; using System.Linq; +using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Integration.Data.Assembly; using Ringtoets.Integration.IO.Assembly; using Ringtoets.Integration.IO.Factories; +using Ringtoets.Integration.IO.Helpers; namespace Ringtoets.Integration.IO.Test.Factories { @@ -62,6 +64,12 @@ public void CreateExportableCombinedSectionAssemblyCollection_WithAssemblyResults_ReturnsExportableCombinedSectionAssemblyCollection() { // Setup + var referenceLine = new ReferenceLine(); + referenceLine.SetGeometry(new[] + { + new Point2D(0, 0), + new Point2D(2, 2) + }); CombinedFailureMechanismSectionAssemblyResult[] assemblyResults = { CreateCombinedFailureMechanismSectionAssemblyResult(21), @@ -70,11 +78,10 @@ // Call ExportableCombinedSectionAssemblyCollection exportableCombinedSectionAssembly = - ExportableCombinedSectionAssemblyCollectionFactory.CreateExportableCombinedSectionAssemblyCollection(assemblyResults, new ReferenceLine()); + ExportableCombinedSectionAssemblyCollectionFactory.CreateExportableCombinedSectionAssemblyCollection(assemblyResults, referenceLine); // Assert - AssertCombinedFailureMechanismSectionAssemblyResults(assemblyResults, - exportableCombinedSectionAssembly); + AssertCombinedFailureMechanismSectionAssemblyResults(assemblyResults, exportableCombinedSectionAssembly, referenceLine); } private static CombinedFailureMechanismSectionAssemblyResult CreateCombinedFailureMechanismSectionAssemblyResult(int seed) @@ -108,7 +115,8 @@ } private static void AssertCombinedFailureMechanismSectionAssemblyResults(IEnumerable expectedSections, - ExportableCombinedSectionAssemblyCollection collection) + ExportableCombinedSectionAssemblyCollection collection, + ReferenceLine referenceLine) { int expectedNrOfSections = expectedSections.Count(); Assert.AreEqual(expectedNrOfSections, collection.Sections.Count()); @@ -120,17 +128,20 @@ ExportableCombinedFailureMechanismSection actualSection = collection.Sections.ElementAt(i); ExportableCombinedSectionAssembly actualSectionResult = collection.CombinedSectionAssemblyResults.ElementAt(i); - AssertExportableCombinedFailureMechanismSection(expectedSection, actualSection); + AssertExportableCombinedFailureMechanismSection(expectedSection, actualSection, referenceLine); AssertExportableCombinedFailureMechanismSectionResult(actualSectionResult, actualSection, expectedSection); } } private static void AssertExportableCombinedFailureMechanismSection(CombinedFailureMechanismSectionAssemblyResult expectedSection, - ExportableCombinedFailureMechanismSection actualSection) + ExportableCombinedFailureMechanismSection actualSection, + ReferenceLine referenceLine) { Assert.AreEqual(expectedSection.SectionStart, actualSection.StartDistance); Assert.AreEqual(expectedSection.SectionEnd, actualSection.EndDistance); - CollectionAssert.IsEmpty(actualSection.Geometry); + CollectionAssert.AreEqual(ExportableFailureMechanismSectionHelper.GetFailureMechanismSectionGeometry( + referenceLine, actualSection.StartDistance, actualSection.EndDistance), + actualSection.Geometry); Assert.AreEqual(ExportableAssemblyMethod.WBI3A1, actualSection.AssemblyMethod); }