From 0b7cb6b879423898a1e51dfee185ec76f3e386a9 Mon Sep 17 00:00:00 2001
From: Elmar Kleijn <elmar.kleijn@deltares.nl>
Date: Mon, 11 Dec 2017 23:27:18 +0000
Subject: [PATCH 1/3] Updated version number [DONT MERGE BACK] Related to Issue
 [WTI-1521]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/branches/Release/17_2@13325 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 74aef59c091d0fcd9dfb3db66a2cb18fcc89f81c
Former-commit-id: 5a73aadc97b4aba6736ef5050fe6f103b286b500
---
 .../Application.Ringtoets.Setup.wixproj                       | 2 +-
 Core/Common/src/Core.Common.Version/GlobalAssembly.cs.svn     | 4 ++--
 .../Core.Common.Utils.Test/Reflection/AssemblyUtilsTest.cs    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Application/Ringtoets/src/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj b/Application/Ringtoets/src/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj
index 6c6ab754e38..efeeafcb28d 100644
--- a/Application/Ringtoets/src/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj
+++ b/Application/Ringtoets/src/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj
@@ -10,7 +10,7 @@
 		Custom Field: ReleaseVersion
 		Field is injected into WiX with the same name to make it available there as well.
 	-->
-    <ReleaseVersion>17.2.1</ReleaseVersion>
+    <ReleaseVersion>17.2.2</ReleaseVersion>
     <!--
 		Environment Variable: BUILD_NUMBER
 		Field could be set by BuildServer. If not present, it will be skipped.
diff --git a/Core/Common/src/Core.Common.Version/GlobalAssembly.cs.svn b/Core/Common/src/Core.Common.Version/GlobalAssembly.cs.svn
index 670a1222ab4..ad5e3b2b6b5 100644
--- a/Core/Common/src/Core.Common.Version/GlobalAssembly.cs.svn
+++ b/Core/Common/src/Core.Common.Version/GlobalAssembly.cs.svn
@@ -35,5 +35,5 @@ using System.Resources;
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 
-[assembly: AssemblyVersion("17.2.1.SVNREV")]
-[assembly: AssemblyFileVersion("17.2.1.SVNREV")]
\ No newline at end of file
+[assembly: AssemblyVersion("17.2.2.SVNREV")]
+[assembly: AssemblyFileVersion("17.2.2.SVNREV")]
\ No newline at end of file
diff --git a/Core/Common/test/Core.Common.Utils.Test/Reflection/AssemblyUtilsTest.cs b/Core/Common/test/Core.Common.Utils.Test/Reflection/AssemblyUtilsTest.cs
index f1d1d55cf34..18b30222598 100644
--- a/Core/Common/test/Core.Common.Utils.Test/Reflection/AssemblyUtilsTest.cs
+++ b/Core/Common/test/Core.Common.Utils.Test/Reflection/AssemblyUtilsTest.cs
@@ -74,7 +74,7 @@ public void GetAssemblyInfo_ForThisTestProjectAssembly_ReturnAssemblyInfoWithExp
             Assert.IsEmpty(assemblyInfo.Description);
             Assert.AreEqual("Core.Common.Utils.Test", assemblyInfo.Product);
             Assert.AreEqual("Core.Common.Utils.Test", assemblyInfo.Title);
-            StringAssert.StartsWith("17.2.1.", assemblyInfo.Version);
+            StringAssert.StartsWith("17.2.2.", assemblyInfo.Version);
         }
 
         [Test]

From 87497da11fa4ec70f8178bfa1e092d2a9c9a8847 Mon Sep 17 00:00:00 2001
From: Elmar Kleijn <elmar.kleijn@deltares.nl>
Date: Tue, 12 Dec 2017 07:20:33 +0000
Subject: [PATCH 2/3] Reverted version number to 17.2.1 [DONT MERGE BACK]
 Related to Issue [WTI-1521]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/branches/Release/17_2@13329 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: aef059b62c5f2774ac162ab5101e111d3a363d50
Former-commit-id: 7c829bf3954ca8fd3aecb5ba31a5c23752e7c125
---
 .../Application.Ringtoets.Setup.wixproj                       | 2 +-
 Core/Common/src/Core.Common.Version/GlobalAssembly.cs.svn     | 4 ++--
 .../Core.Common.Utils.Test/Reflection/AssemblyUtilsTest.cs    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Application/Ringtoets/src/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj b/Application/Ringtoets/src/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj
index efeeafcb28d..6c6ab754e38 100644
--- a/Application/Ringtoets/src/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj
+++ b/Application/Ringtoets/src/Application.Ringtoets.Setup/Application.Ringtoets.Setup.wixproj
@@ -10,7 +10,7 @@
 		Custom Field: ReleaseVersion
 		Field is injected into WiX with the same name to make it available there as well.
 	-->
-    <ReleaseVersion>17.2.2</ReleaseVersion>
+    <ReleaseVersion>17.2.1</ReleaseVersion>
     <!--
 		Environment Variable: BUILD_NUMBER
 		Field could be set by BuildServer. If not present, it will be skipped.
diff --git a/Core/Common/src/Core.Common.Version/GlobalAssembly.cs.svn b/Core/Common/src/Core.Common.Version/GlobalAssembly.cs.svn
index ad5e3b2b6b5..670a1222ab4 100644
--- a/Core/Common/src/Core.Common.Version/GlobalAssembly.cs.svn
+++ b/Core/Common/src/Core.Common.Version/GlobalAssembly.cs.svn
@@ -35,5 +35,5 @@ using System.Resources;
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 
-[assembly: AssemblyVersion("17.2.2.SVNREV")]
-[assembly: AssemblyFileVersion("17.2.2.SVNREV")]
\ No newline at end of file
+[assembly: AssemblyVersion("17.2.1.SVNREV")]
+[assembly: AssemblyFileVersion("17.2.1.SVNREV")]
\ No newline at end of file
diff --git a/Core/Common/test/Core.Common.Utils.Test/Reflection/AssemblyUtilsTest.cs b/Core/Common/test/Core.Common.Utils.Test/Reflection/AssemblyUtilsTest.cs
index 18b30222598..f1d1d55cf34 100644
--- a/Core/Common/test/Core.Common.Utils.Test/Reflection/AssemblyUtilsTest.cs
+++ b/Core/Common/test/Core.Common.Utils.Test/Reflection/AssemblyUtilsTest.cs
@@ -74,7 +74,7 @@ public void GetAssemblyInfo_ForThisTestProjectAssembly_ReturnAssemblyInfoWithExp
             Assert.IsEmpty(assemblyInfo.Description);
             Assert.AreEqual("Core.Common.Utils.Test", assemblyInfo.Product);
             Assert.AreEqual("Core.Common.Utils.Test", assemblyInfo.Title);
-            StringAssert.StartsWith("17.2.2.", assemblyInfo.Version);
+            StringAssert.StartsWith("17.2.1.", assemblyInfo.Version);
         }
 
         [Test]

From b1540370c923194a3dc4c136710bc635882f5c47 Mon Sep 17 00:00:00 2001
From: Elmar Kleijn <elmar.kleijn@deltares.nl>
Date: Tue, 12 Dec 2017 08:41:25 +0000
Subject: [PATCH 3/3] Fixed build Related to Issue [WTI-1521]

git-svn-id: https://repos.deltares.nl/repos/WettelijkToetsInstrumentarium/branches/Release/17_2@13330 5a3db67b-de53-47b5-99c8-a1c30a6650e2

Former-commit-id: 150a2eca0f0fbbc5a5de7d3664aa9b6a976d2ed1
Former-commit-id: beecf4927e252106b8d44fbf3b8df2a2b6ed44b5
---
 .../Data/ChartMultipleAreaData.cs              |  4 ++--
 .../Data/ChartMultipleLineData.cs              |  4 ++--
 .../Data/PointBasedChartData.cs                |  5 +++--
 .../DataSeries/Chart/ChartAreaDataSeries.cs    |  3 ++-
 .../DataSeries/Chart/ChartLineDataSeries.cs    |  3 ++-
 .../Chart/ChartMultipleAreaDataSeries.cs       |  2 +-
 .../Chart/ChartMultipleLineDataSeries.cs       |  2 +-
 .../DataSeries/Chart/ChartPointDataSeries.cs   |  3 ++-
 .../GrassCoverErosionInwardsInputViewTest.cs   |  6 +++---
 ...bilityInwardsSliceChartDataPointsFactory.cs |  2 +-
 ...MacroStabilityInwardsViewChartDataAssert.cs |  2 +-
 .../Views/PipingInputViewTest.cs               | 18 +++++++++---------
 .../Views/WaveConditionsInputViewTest.cs       |  2 +-
 13 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/Core/Components/src/Core.Components.Chart/Data/ChartMultipleAreaData.cs b/Core/Components/src/Core.Components.Chart/Data/ChartMultipleAreaData.cs
index ad568e34b21..cbe9ca03118 100644
--- a/Core/Components/src/Core.Components.Chart/Data/ChartMultipleAreaData.cs
+++ b/Core/Components/src/Core.Components.Chart/Data/ChartMultipleAreaData.cs
@@ -33,7 +33,7 @@ namespace Core.Components.Chart.Data
     /// </summary>
     public class ChartMultipleAreaData : ChartData
     {
-        private IEnumerable<Point2D[]> areas;
+        private IEnumerable<IEnumerable<Point2D>> areas;
 
         /// <summary>
         /// Creates a new instance of <see cref="ChartMultipleAreaData"/> with default styling.
@@ -75,7 +75,7 @@ public override bool HasData
         /// </summary>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/> is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="value"/> contains any <c>null</c> value.</exception>
-        public IEnumerable<Point2D[]> Areas
+        public IEnumerable<IEnumerable<Point2D>> Areas
         {
             get
             {
diff --git a/Core/Components/src/Core.Components.Chart/Data/ChartMultipleLineData.cs b/Core/Components/src/Core.Components.Chart/Data/ChartMultipleLineData.cs
index 1373111f66a..ba50f3023f2 100644
--- a/Core/Components/src/Core.Components.Chart/Data/ChartMultipleLineData.cs
+++ b/Core/Components/src/Core.Components.Chart/Data/ChartMultipleLineData.cs
@@ -33,7 +33,7 @@ namespace Core.Components.Chart.Data
     /// </summary>
     public class ChartMultipleLineData : ChartData
     {
-        private IEnumerable<Point2D[]> lines;
+        private IEnumerable<IEnumerable<Point2D>> lines;
 
         /// <summary>
         /// Creates a new instance of <see cref="ChartMultipleLineData"/> with default styling.
@@ -77,7 +77,7 @@ public override bool HasData
         /// is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when <paramref name="value"/> contains
         /// any <c>null</c> value.</exception>
-        public IEnumerable<Point2D[]> Lines
+        public IEnumerable<IEnumerable<Point2D>> Lines
         {
             get
             {
diff --git a/Core/Components/src/Core.Components.Chart/Data/PointBasedChartData.cs b/Core/Components/src/Core.Components.Chart/Data/PointBasedChartData.cs
index 93954dfac2d..40c97592f0e 100644
--- a/Core/Components/src/Core.Components.Chart/Data/PointBasedChartData.cs
+++ b/Core/Components/src/Core.Components.Chart/Data/PointBasedChartData.cs
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Base.Geometry;
 
@@ -30,7 +31,7 @@ namespace Core.Components.Chart.Data
     /// </summary>
     public abstract class PointBasedChartData : ChartData
     {
-        private Point2D[] points;
+        private IEnumerable<Point2D> points;
 
         /// <summary>
         /// Creates a new instance of <see cref="PointBasedChartData"/>.
@@ -55,7 +56,7 @@ public override bool HasData
         /// Gets or sets an array of points in 2D space.
         /// </summary>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="value"/> is <c>null</c>.</exception>
-        public Point2D[] Points
+        public IEnumerable<Point2D> Points
         {
             get
             {
diff --git a/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartAreaDataSeries.cs b/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartAreaDataSeries.cs
index 2b263e320c2..4225614201a 100644
--- a/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartAreaDataSeries.cs
+++ b/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartAreaDataSeries.cs
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using Core.Common.Base.Geometry;
 using Core.Components.Chart.Data;
 using Core.Components.OxyPlot.Converter.Chart;
@@ -35,7 +36,7 @@ public class ChartAreaDataSeries : AreaSeries, IChartDataSeries
         private readonly ChartAreaData chartAreaData;
         private readonly ChartAreaDataConverter converter = new ChartAreaDataConverter();
 
-        private Point2D[] drawnPoints;
+        private IEnumerable<Point2D> drawnPoints;
 
         /// <summary>
         /// Creates a new instance of <see cref="ChartAreaDataSeries"/>.
diff --git a/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartLineDataSeries.cs b/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartLineDataSeries.cs
index 43fbccc18fd..45d71ae0880 100644
--- a/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartLineDataSeries.cs
+++ b/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartLineDataSeries.cs
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using Core.Common.Base.Geometry;
 using Core.Components.Chart.Data;
 using Core.Components.OxyPlot.Converter.Chart;
@@ -35,7 +36,7 @@ public class ChartLineDataSeries : LineSeries, IChartDataSeries
         private readonly ChartLineData chartLineData;
         private readonly ChartLineDataConverter converter = new ChartLineDataConverter();
 
-        private Point2D[] drawnPoints;
+        private IEnumerable<Point2D> drawnPoints;
 
         /// <summary>
         /// Creates a new instance of <see cref="ChartLineDataSeries"/>.
diff --git a/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleAreaDataSeries.cs b/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleAreaDataSeries.cs
index 0fcc3841d7a..8315f052169 100644
--- a/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleAreaDataSeries.cs
+++ b/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleAreaDataSeries.cs
@@ -36,7 +36,7 @@ public class ChartMultipleAreaDataSeries : MultipleAreaSeries, IChartDataSeries
         private readonly ChartMultipleAreaData chartMultipleAreaData;
         private readonly ChartMultipleAreaDataConverter converter = new ChartMultipleAreaDataConverter();
 
-        private IEnumerable<Point2D[]> drawnAreas;
+        private IEnumerable<IEnumerable<Point2D>> drawnAreas;
 
         /// <summary>
         /// Creates a new instance of <see cref="ChartMultipleAreaDataSeries"/>.
diff --git a/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleLineDataSeries.cs b/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleLineDataSeries.cs
index c8819fd427d..45dd581ac2f 100644
--- a/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleLineDataSeries.cs
+++ b/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleLineDataSeries.cs
@@ -36,7 +36,7 @@ public class ChartMultipleLineDataSeries : MultipleLineSeries, IChartDataSeries
         private readonly ChartMultipleLineData chartMultipleLineData;
         private readonly ChartMultipleLineDataConverter converter = new ChartMultipleLineDataConverter();
 
-        private IEnumerable<Point2D[]> drawnLines;
+        private IEnumerable<IEnumerable<Point2D>> drawnLines;
 
         /// <summary>
         /// Creates a new instance of <see cref="ChartMultipleLineDataSeries"/>.
diff --git a/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartPointDataSeries.cs b/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartPointDataSeries.cs
index f708fdfb7eb..062c205b541 100644
--- a/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartPointDataSeries.cs
+++ b/Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartPointDataSeries.cs
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using System;
+using System.Collections.Generic;
 using Core.Common.Base.Geometry;
 using Core.Components.Chart.Data;
 using Core.Components.OxyPlot.Converter.Chart;
@@ -35,7 +36,7 @@ public class ChartPointDataSeries : LineSeries, IChartDataSeries
         private readonly ChartPointData chartPointData;
         private readonly ChartPointDataConverter converter = new ChartPointDataConverter();
 
-        private Point2D[] drawnPoints;
+        private IEnumerable<Point2D> drawnPoints;
 
         /// <summary>
         /// Creates a new instance of <see cref="ChartPointDataSeries"/>.
diff --git a/Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs b/Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs
index 2ab597a9e38..c3cf8e12e2e 100644
--- a/Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs
+++ b/Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs
@@ -530,7 +530,7 @@ private static void AssertDikeProfileChartData(DikeProfile dikeProfile, ChartDat
             var dikeProfileChartData = (ChartLineData) chartData;
 
             RoughnessPoint[] dikeGeometry = dikeProfile.DikeGeometry;
-            Assert.AreEqual(dikeGeometry.Length, dikeProfileChartData.Points.Length);
+            Assert.AreEqual(dikeGeometry.Length, dikeProfileChartData.Points.Count());
             CollectionAssert.AreEqual(dikeGeometry.Select(dg => dg.Point), dikeProfileChartData.Points);
 
             string expectedName = $"{dikeProfile.Name} - Dijkprofiel";
@@ -543,7 +543,7 @@ private static void AssertForeshoreChartData(DikeProfile dikeProfile, ChartData
             var foreshoreChartData = (ChartLineData) chartData;
 
             RoundedPoint2DCollection foreshoreGeometry = dikeProfile.ForeshoreGeometry;
-            Assert.AreEqual(foreshoreGeometry.Count(), foreshoreChartData.Points.Length);
+            Assert.AreEqual(foreshoreGeometry.Count(), foreshoreChartData.Points.Count());
             CollectionAssert.AreEqual(foreshoreGeometry, foreshoreChartData.Points);
 
             string expectedName = $"{dikeProfile.Name} - Voorlandprofiel";
@@ -561,7 +561,7 @@ private static void AssertDikeHeightChartData(DikeProfile dikeProfile, ChartData
                 new Point2D(dikeProfile.DikeGeometry.Last().Point.X, dikeProfile.DikeHeight)
             };
 
-            Assert.AreEqual(dikeHeightGeometry.Length, dikeHeightChartData.Points.Length);
+            Assert.AreEqual(dikeHeightGeometry.Length, dikeHeightChartData.Points.Count());
             CollectionAssert.AreEqual(dikeHeightGeometry, dikeHeightChartData.Points);
 
             Assert.AreEqual("Dijkhoogte", chartData.Name);
diff --git a/Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataPointsFactory.cs b/Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataPointsFactory.cs
index 75e69044329..645e07dbd82 100644
--- a/Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataPointsFactory.cs
+++ b/Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Factories/MacroStabilityInwardsSliceChartDataPointsFactory.cs
@@ -24,7 +24,7 @@
 using System.Linq;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
-using Core.Common.Util.Extensions;
+using Core.Common.Utils.Extensions;
 using Core.Components.Chart.Data;
 using Ringtoets.MacroStabilityInwards.Data;
 
diff --git a/Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs b/Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs
index fb5585bd349..5729b61f271 100644
--- a/Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs
+++ b/Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.TestUtil/MacroStabilityInwardsViewChartDataAssert.cs
@@ -47,7 +47,7 @@ public static void AssertSurfaceLineChartData(MacroStabilityInwardsSurfaceLine o
             Assert.IsInstanceOf<ChartLineData>(actual);
             var surfaceLineChartData = (ChartLineData) actual;
 
-            Assert.AreEqual(original.Points.Length, surfaceLineChartData.Points.Length);
+            Assert.AreEqual(original.Points.Length, surfaceLineChartData.Points.Count());
             Assert.AreEqual(original.Name, actual.Name);
             CollectionAssert.AreEqual(original.LocalGeometry, surfaceLineChartData.Points);
         }
diff --git a/Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs b/Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs
index 90e6c0b80d2..5d45726ad19 100644
--- a/Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs
+++ b/Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs
@@ -780,7 +780,7 @@ private static void AssertSurfaceLineChartData(PipingSurfaceLine surfaceLine, Ch
             Assert.IsInstanceOf<ChartLineData>(chartData);
             var surfaceLineChartData = (ChartLineData) chartData;
 
-            Assert.AreEqual(surfaceLine.Points.Length, surfaceLineChartData.Points.Length);
+            Assert.AreEqual(surfaceLine.Points.Length, surfaceLineChartData.Points.Count());
             CollectionAssert.AreEqual(surfaceLine.LocalGeometry, surfaceLineChartData.Points);
             Assert.AreEqual(surfaceLine.Name, chartData.Name);
         }
@@ -790,7 +790,7 @@ private static void AssertEntryPointLPointchartData(PipingInput pipingInput, Pip
             Assert.IsInstanceOf<ChartPointData>(chartData);
             var entryPointChartData = (ChartPointData) chartData;
 
-            Assert.AreEqual(1, entryPointChartData.Points.Length);
+            Assert.AreEqual(1, entryPointChartData.Points.Count());
             var entryPoint = new Point2D(pipingInput.EntryPointL, surfaceLine.GetZAtL(pipingInput.EntryPointL));
             CollectionAssert.AreEqual(new[]
             {
@@ -804,7 +804,7 @@ private static void AssertExitPointLPointchartData(PipingInput pipingInput, Pipi
             Assert.IsInstanceOf<ChartPointData>(chartData);
             var exitPointChartData = (ChartPointData) chartData;
 
-            Assert.AreEqual(1, exitPointChartData.Points.Length);
+            Assert.AreEqual(1, exitPointChartData.Points.Count());
             var exitPoint = new Point2D(pipingInput.ExitPointL, surfaceLine.GetZAtL(pipingInput.ExitPointL));
             CollectionAssert.AreEqual(new[]
             {
@@ -821,7 +821,7 @@ private static void AssertCharacteristicPoints(PipingSurfaceLine surfaceLine, IL
             var lastPoint = new Point2D(last.X, last.Y);
 
             var ditchDikeSideData = (ChartPointData) characteristicPoints[ditchDikeSideIndex];
-            Assert.AreEqual(1, ditchDikeSideData.Points.Length);
+            Assert.AreEqual(1, ditchDikeSideData.Points.Count());
             CollectionAssert.AreEqual(new[]
             {
                 surfaceLine.DitchDikeSide.ProjectIntoLocalCoordinates(firstPoint, lastPoint)
@@ -829,7 +829,7 @@ private static void AssertCharacteristicPoints(PipingSurfaceLine surfaceLine, IL
             Assert.AreEqual("Insteek sloot dijkzijde", ditchDikeSideData.Name);
 
             var bottomDitchDikeSideData = (ChartPointData) characteristicPoints[bottomDitchDikeSideIndex];
-            Assert.AreEqual(1, bottomDitchDikeSideData.Points.Length);
+            Assert.AreEqual(1, bottomDitchDikeSideData.Points.Count());
             CollectionAssert.AreEqual(new[]
             {
                 surfaceLine.BottomDitchDikeSide.ProjectIntoLocalCoordinates(firstPoint, lastPoint)
@@ -837,7 +837,7 @@ private static void AssertCharacteristicPoints(PipingSurfaceLine surfaceLine, IL
             Assert.AreEqual("Slootbodem dijkzijde", bottomDitchDikeSideData.Name);
 
             var ditchPolderSideData = (ChartPointData) characteristicPoints[ditchPolderSideIndex];
-            Assert.AreEqual(1, ditchPolderSideData.Points.Length);
+            Assert.AreEqual(1, ditchPolderSideData.Points.Count());
             CollectionAssert.AreEqual(new[]
             {
                 surfaceLine.DitchPolderSide.ProjectIntoLocalCoordinates(firstPoint, lastPoint)
@@ -845,7 +845,7 @@ private static void AssertCharacteristicPoints(PipingSurfaceLine surfaceLine, IL
             Assert.AreEqual("Insteek sloot polderzijde", ditchPolderSideData.Name);
 
             var bottomDitchPolderSideData = (ChartPointData) characteristicPoints[bottomDitchPolderSideIndex];
-            Assert.AreEqual(1, bottomDitchPolderSideData.Points.Length);
+            Assert.AreEqual(1, bottomDitchPolderSideData.Points.Count());
             CollectionAssert.AreEqual(new[]
             {
                 surfaceLine.BottomDitchPolderSide.ProjectIntoLocalCoordinates(firstPoint, lastPoint)
@@ -853,7 +853,7 @@ private static void AssertCharacteristicPoints(PipingSurfaceLine surfaceLine, IL
             Assert.AreEqual("Slootbodem polderzijde", bottomDitchPolderSideData.Name);
 
             var dikeToeAtPolderData = (ChartPointData) characteristicPoints[dikeToeAtPolderIndex];
-            Assert.AreEqual(1, dikeToeAtPolderData.Points.Length);
+            Assert.AreEqual(1, dikeToeAtPolderData.Points.Count());
             CollectionAssert.AreEqual(new[]
             {
                 surfaceLine.DikeToeAtPolder.ProjectIntoLocalCoordinates(firstPoint, lastPoint)
@@ -861,7 +861,7 @@ private static void AssertCharacteristicPoints(PipingSurfaceLine surfaceLine, IL
             Assert.AreEqual("Teen dijk binnenwaarts", dikeToeAtPolderData.Name);
 
             var dikeToeAtRiverData = (ChartPointData) characteristicPoints[dikeToeAtRiverIndex];
-            Assert.AreEqual(1, dikeToeAtRiverData.Points.Length);
+            Assert.AreEqual(1, dikeToeAtRiverData.Points.Count());
             CollectionAssert.AreEqual(new[]
             {
                 surfaceLine.DikeToeAtRiver.ProjectIntoLocalCoordinates(firstPoint, lastPoint)
diff --git a/Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs b/Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs
index ccdf5533fee..0e330f72acc 100644
--- a/Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs
+++ b/Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs
@@ -610,7 +610,7 @@ private static void AssertForeshoreChartData(ForeshoreProfile foreshoreProfile,
             var foreshoreChartData = (ChartLineData) chartData;
 
             RoundedPoint2DCollection foreshoreGeometry = foreshoreProfile.Geometry;
-            Assert.AreEqual(foreshoreGeometry.Count(), foreshoreChartData.Points.Length);
+            Assert.AreEqual(foreshoreGeometry.Count(), foreshoreChartData.Points.Count());
             CollectionAssert.AreEqual(foreshoreGeometry, foreshoreChartData.Points);
 
             string expectedName = $"{foreshoreProfile.Name} - Voorlandprofiel";