Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssessmentSection.cs =================================================================== diff -u -r5c59e60cae7bc68b321c0ee187a7d4dd9dd753b2 -r40cea250dc8bceda2770ba103d1b9e1ebe1c267c --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssessmentSection.cs (.../SerializableAssessmentSection.cs) (revision 5c59e60cae7bc68b321c0ee187a7d4dd9dd753b2) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssessmentSection.cs (.../SerializableAssessmentSection.cs) (revision 40cea250dc8bceda2770ba103d1b9e1ebe1c267c) @@ -48,12 +48,11 @@ /// The unique ID of the assessment section. /// The name of the assessment section. /// The length of the surface line in meters. - /// The geometry of the surface line. + /// The geometry of the surface line. /// Thrown when any parameter is null. public SerializableAssessmentSection(string id, string name, - double surfaceLineLength, - IEnumerable surfaceLineGeometry) : this() + IEnumerable geometry) : this() { if (id == null) { @@ -65,15 +64,15 @@ throw new ArgumentNullException(nameof(name)); } - if (surfaceLineGeometry == null) + if (geometry == null) { - throw new ArgumentNullException(nameof(surfaceLineGeometry)); + throw new ArgumentNullException(nameof(geometry)); } Id = id; Name = name; - SurfaceLineLength = new SerializableMeasure("m", surfaceLineLength); - SurfaceLineGeometry = new SerializableLine(surfaceLineGeometry); + SurfaceLineLength = new SerializableMeasure("m", Math2D.Length(geometry)); + SurfaceLineGeometry = new SerializableLine(geometry); } /// Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentProcessTest.cs =================================================================== diff -u -rc37e7aa9fdd38a0476335e056b33c583486ed1af -r40cea250dc8bceda2770ba103d1b9e1ebe1c267c --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentProcessTest.cs (.../SerializableAssessmentProcessTest.cs) (revision c37e7aa9fdd38a0476335e056b33c583486ed1af) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentProcessTest.cs (.../SerializableAssessmentProcessTest.cs) (revision 40cea250dc8bceda2770ba103d1b9e1ebe1c267c) @@ -98,7 +98,6 @@ var assessmentSection = new SerializableAssessmentSection( "assessment section id", "name", - random.NextDouble(), new[] { new Point2D(random.NextDouble(), random.NextDouble()), Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentSectionTest.cs =================================================================== diff -u -r5c59e60cae7bc68b321c0ee187a7d4dd9dd753b2 -r40cea250dc8bceda2770ba103d1b9e1ebe1c267c --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentSectionTest.cs (.../SerializableAssessmentSectionTest.cs) (revision 5c59e60cae7bc68b321c0ee187a7d4dd9dd753b2) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentSectionTest.cs (.../SerializableAssessmentSectionTest.cs) (revision 40cea250dc8bceda2770ba103d1b9e1ebe1c267c) @@ -64,7 +64,6 @@ // Call TestDelegate call = () => new SerializableAssessmentSection(null, "name", - new Random(39).NextDouble(), Enumerable.Empty()); // Assert @@ -78,7 +77,6 @@ // Call TestDelegate call = () => new SerializableAssessmentSection("id", null, - new Random(39).NextDouble(), Enumerable.Empty()); // Assert @@ -87,17 +85,16 @@ } [Test] - public void Constructor_SurfaceLineGeometryNull_ThrowsArgumentNullException() + public void Constructor_GeometryNull_ThrowsArgumentNullException() { // Call TestDelegate call = () => new SerializableAssessmentSection("id", "name", - new Random(39).NextDouble(), null); // Assert var exception = Assert.Throws(call); - Assert.AreEqual("surfaceLineGeometry", exception.ParamName); + Assert.AreEqual("geometry", exception.ParamName); } [Test] @@ -108,21 +105,20 @@ const string id = "section id"; var random = new Random(39); - double length = random.NextDouble(); var geometry = new[] { new Point2D(random.NextDouble(), random.NextDouble()), new Point2D(random.NextDouble(), random.NextDouble()) }; // Call - var assessmentSection = new SerializableAssessmentSection(id, name, length, geometry); + var assessmentSection = new SerializableAssessmentSection(id, name, geometry); // Assert Assert.AreEqual(id, assessmentSection.Id); Assert.AreEqual(name, assessmentSection.Name); Assert.AreEqual("m", assessmentSection.SurfaceLineLength.UnitOfMeasure); - Assert.AreEqual(length, assessmentSection.SurfaceLineLength.Value); + Assert.AreEqual(Math2D.Length(geometry), assessmentSection.SurfaceLineLength.Value); Assert.IsNotNull(assessmentSection.SurfaceLineGeometry); } }