Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/ReferenceLineTestFactory.cs =================================================================== diff -u -rb57deef61b4908df4b37e447fbbc4fb2e2828cc0 -r36cbe3953e6106ff92f09faa67b69ed8c666bd5e --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/ReferenceLineTestFactory.cs (.../ReferenceLineTestFactory.cs) (revision b57deef61b4908df4b37e447fbbc4fb2e2828cc0) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/ReferenceLineTestFactory.cs (.../ReferenceLineTestFactory.cs) (revision 36cbe3953e6106ff92f09faa67b69ed8c666bd5e) @@ -28,7 +28,7 @@ /// Factory that creates simple instances /// which can be used for testing. /// - public class ReferenceLineTestFactory + public static class ReferenceLineTestFactory { /// /// Creates a new instance of with a default geometry. Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableFailureMechanismFactory.cs =================================================================== diff -u -r40d028cbcbe3c628ba0ab4fc907d5c8b456dffc8 -r36cbe3953e6106ff92f09faa67b69ed8c666bd5e --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableFailureMechanismFactory.cs (.../ExportableFailureMechanismFactory.cs) (revision 40d028cbcbe3c628ba0ab4fc907d5c8b456dffc8) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Factories/ExportableFailureMechanismFactory.cs (.../ExportableFailureMechanismFactory.cs) (revision 36cbe3953e6106ff92f09faa67b69ed8c666bd5e) @@ -20,8 +20,6 @@ // All rights reserved. using System; -using System.Collections.Generic; -using Core.Common.Base.Geometry; using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Integration.IO.Assembly; @@ -60,7 +58,7 @@ 0), new[] { - new ExportableAggregatedFailureMechanismSectionAssemblyWithCombinedProbabilityResult(CreateExportableFailureMechanismSection(assessmentSection.ReferenceLine.Points), + new ExportableAggregatedFailureMechanismSectionAssemblyWithCombinedProbabilityResult(CreateExportableFailureMechanismSection(assessmentSection.ReferenceLine), new ExportableSectionAssemblyResultWithProbability(ExportableAssemblyMethod.WBI0A1, FailureMechanismSectionAssemblyCategoryGroup.NotApplicable, 0)) @@ -89,9 +87,9 @@ failureMechanismGroup); } - private static ExportableFailureMechanismSection CreateExportableFailureMechanismSection(IEnumerable geometry) + private static ExportableFailureMechanismSection CreateExportableFailureMechanismSection(ReferenceLine referenceLine) { - return new ExportableFailureMechanismSection(geometry, 0, Math2D.Length(geometry)); + return new ExportableFailureMechanismSection(referenceLine.Points, 0, referenceLine.Length); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableFailureMechanismFactoryTest.cs =================================================================== diff -u -r40d028cbcbe3c628ba0ab4fc907d5c8b456dffc8 -r36cbe3953e6106ff92f09faa67b69ed8c666bd5e --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableFailureMechanismFactoryTest.cs (.../ExportableFailureMechanismFactoryTest.cs) (revision 40d028cbcbe3c628ba0ab4fc907d5c8b456dffc8) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableFailureMechanismFactoryTest.cs (.../ExportableFailureMechanismFactoryTest.cs) (revision 36cbe3953e6106ff92f09faa67b69ed8c666bd5e) @@ -27,6 +27,7 @@ using Rhino.Mocks; using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.AssessmentSection; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Integration.IO.Assembly; using Ringtoets.Integration.IO.Factories; @@ -64,7 +65,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - ReferenceLine referenceLine = CreateReferenceLine(); + ReferenceLine referenceLine = ReferenceLineTestFactory.CreateReferenceLineWithGeometry(); assessmentSection.ReferenceLine = referenceLine; var group = random.NextEnumValue(); @@ -97,7 +98,7 @@ ExportableFailureMechanismSection failureMechanismSection = exportableFailureMechanismSectionAssembly.FailureMechanismSection; Assert.AreSame(referenceLine.Points, failureMechanismSection.Geometry); Assert.AreEqual(0, failureMechanismSection.StartDistance); - Assert.AreEqual(Math2D.Length(referenceLine.Points), failureMechanismSection.EndDistance); + Assert.AreEqual(referenceLine.Length, failureMechanismSection.EndDistance); } [Test] @@ -123,19 +124,5 @@ CollectionAssert.IsEmpty(exportableFailureMechanism.SectionAssemblyResults); } - - private static ReferenceLine CreateReferenceLine() - { - var referenceLine = new ReferenceLine(); - referenceLine.SetGeometry(new[] - { - new Point2D(1, 1), - new Point2D(2, 2), - new Point2D(3, 3), - new Point2D(4, 4) - }); - - return referenceLine; - } } } \ No newline at end of file