Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs
===================================================================
diff -u -r27e5d9fb2ffd87ea219ecfb4217a8080f819df62 -r6ae3b82563c665574a6e8e1465e1fec3d8080dbe
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs	(.../PipingInputViewTest.cs)	(revision 27e5d9fb2ffd87ea219ecfb4217a8080f819df62)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs	(.../PipingInputViewTest.cs)	(revision 6ae3b82563c665574a6e8e1465e1fec3d8080dbe)
@@ -132,7 +132,7 @@
                 var points = new[]
                 {
                     new Point3D(1.2, 2.3, 4.0),
-                    new Point3D(2.7, 2.0, 6.0)
+                    new Point3D(2.7, 2.8, 6.0)
                 };
 
                 var surfaceLine = new RingtoetsPipingSurfaceLine()
@@ -163,7 +163,7 @@
                 Assert.IsNotNull(chartData);
                 Assert.AreEqual(Resources.PipingInputContext_NodeDisplayName, chartData.Name);
 
-                Assert.AreEqual(8, chartData.List.Count);
+                Assert.AreEqual(9, chartData.List.Count);
                 AssertSurfaceLineChartData(surfaceLine, chartData.List[surfaceLineIndex]);
                 AssertEntryPointLPointchartData(pipingInput, surfaceLine, chartData.List[entryPointIndex]);
 
@@ -189,9 +189,10 @@
                 Assert.IsNotNull(chartData);
                 Assert.AreEqual(Resources.PipingInputContext_NodeDisplayName, chartData.Name);
 
-                Assert.AreEqual(8, chartData.List.Count);
+                Assert.AreEqual(9, chartData.List.Count);
                 var lineData = (ChartLineData) chartData.List[surfaceLineIndex];
-                var pointData = (ChartPointData) chartData.List[entryPointIndex];
+                var entryPointData = (ChartPointData) chartData.List[entryPointIndex];
+                var exitPointData = (ChartPointData) chartData.List[exitPointIndex];
                 var ditchDikeSideData = (ChartPointData) chartData.List[ditchDikeSideIndex];
                 var bottomDitchDikeSideData = (ChartPointData) chartData.List[bottomDitchDikeSideIndex];
                 var ditchPolderSideData = (ChartPointData) chartData.List[ditchPolderSideIndex];
@@ -200,15 +201,17 @@
                 var dikeToeAtRiverData = (ChartPointData) chartData.List[dikeToeAtRiverIndex];
 
                 Assert.AreEqual(0, lineData.Points.Count());
-                Assert.AreEqual(0, pointData.Points.Count());
+                Assert.AreEqual(0, entryPointData.Points.Count());
+                Assert.AreEqual(0, exitPointData.Points.Count());
                 Assert.AreEqual(0, ditchDikeSideData.Points.Count());
                 Assert.AreEqual(0, bottomDitchDikeSideData.Points.Count());
                 Assert.AreEqual(0, ditchPolderSideData.Points.Count());
                 Assert.AreEqual(0, bottomDitchPolderSideData.Points.Count());
                 Assert.AreEqual(0, dikeToeAtPolderData.Points.Count());
                 Assert.AreEqual(0, dikeToeAtRiverData.Points.Count());
                 Assert.AreEqual(Resources.RingtoetsPipingSurfaceLine_DisplayName, lineData.Name);
-                Assert.AreEqual(Resources.PipingInput_EntryPointL_DisplayName, pointData.Name);
+                Assert.AreEqual(Resources.PipingInput_EntryPointL_DisplayName, entryPointData.Name);
+                Assert.AreEqual(Resources.PipingInput_ExitPointL_DisplayName, exitPointData.Name);
                 Assert.AreEqual(PipingDataResources.CharacteristicPoint_DitchDikeSide, ditchDikeSideData.Name);
                 Assert.AreEqual(PipingDataResources.CharacteristicPoint_BottomDitchDikeSide, bottomDitchDikeSideData.Name);
                 Assert.AreEqual(PipingDataResources.CharacteristicPoint_DitchPolderSide, ditchPolderSideData.Name);
@@ -341,7 +344,7 @@
                 var points = new[]
                 {
                     characteristicPoint,
-                    new Point3D(2.7, 2.0, 6.0)
+                    new Point3D(2.7, 2.8, 6.0)
                 };
 
                 var surfaceLine = new RingtoetsPipingSurfaceLine
@@ -364,6 +367,7 @@
                 view.Data = pipingInput;
                 ChartLineData oldSurfaceLineChartData = (ChartLineData) view.Chart.Data.List[surfaceLineIndex];
                 ChartPointData oldEntryPointChartData = (ChartPointData)view.Chart.Data.List[entryPointIndex];
+                ChartPointData oldExitPointChartData = (ChartPointData) view.Chart.Data.List[exitPointIndex];
                 ChartPointData oldDitchDikeSideData = (ChartPointData)view.Chart.Data.List[ditchDikeSideIndex];
                 ChartPointData oldBottomDitchDikeSideData = (ChartPointData)view.Chart.Data.List[bottomDitchDikeSideIndex];
                 ChartPointData oldDitchPolderSideData = (ChartPointData)view.Chart.Data.List[ditchPolderSideIndex];
@@ -403,6 +407,10 @@
                 ChartPointData newEntryPointChartData = (ChartPointData) view.Chart.Data.List[entryPointIndex];
                 Assert.AreNotEqual(oldEntryPointChartData, newEntryPointChartData);
                 AssertEntryPointLPointchartData(pipingInput, surfaceLine2, newEntryPointChartData);
+                
+                ChartPointData newExitPointChartData = (ChartPointData) view.Chart.Data.List[exitPointIndex];
+                Assert.AreNotEqual(oldExitPointChartData, newExitPointChartData);
+                AssertExitPointLPointchartData(pipingInput, surfaceLine2, newExitPointChartData);
 
                 ChartPointData newDitchDikeSideData = (ChartPointData)view.Chart.Data.List[ditchDikeSideIndex];
                 Assert.AreNotEqual(oldDitchDikeSideData, newDitchDikeSideData);
@@ -435,7 +443,7 @@
                 var points = new[]
                 {
                     new Point3D(1.2, 2.3, 4.0),
-                    new Point3D(2.7, 2.0, 6.0)
+                    new Point3D(2.7, 2.8, 6.0)
                 };
 
                 var surfaceLine = new RingtoetsPipingSurfaceLine
@@ -483,7 +491,7 @@
                 var points = new[]
                 {
                     new Point3D(1.2, 2.3, 4.0),
-                    new Point3D(2.7, 2.0, 6.0)
+                    new Point3D(2.7, 2.8, 6.0)
                 };
 
                 var surfaceLine = new RingtoetsPipingSurfaceLine
@@ -530,7 +538,7 @@
                 var points = new[]
                 {
                     new Point3D(1.2, 2.3, 4.0),
-                    new Point3D(2.7, 2.0, 6.0)
+                    new Point3D(2.7, 2.8, 6.0)
                 };
 
                 var surfaceLine = new RingtoetsPipingSurfaceLine
@@ -575,7 +583,8 @@
         private const int ditchDikeSideIndex = 4;
         private const int dikeToeAtRiverIndex = 5;
         private const int dikeToeAtPolderIndex = 6;
-        private const int entryPointIndex = 7;
+        private const int exitPointIndex = 7;
+        private const int entryPointIndex = 8;
 
         private void AssertSurfaceLineChartData(RingtoetsPipingSurfaceLine surfaceLine, ChartData chartData)
         {
@@ -598,6 +607,17 @@
             Assert.AreEqual(Resources.PipingInput_EntryPointL_DisplayName, entryPointChartData.Name);
         }
 
+        private void AssertExitPointLPointchartData(PipingInput pipingInput, RingtoetsPipingSurfaceLine surfaceLine, ChartData chartData)
+        {
+            Assert.IsInstanceOf<ChartPointData>(chartData);
+            ChartPointData exitPointChartData = (ChartPointData)chartData;
+
+            Assert.AreEqual(1, exitPointChartData.Points.Count());
+            Point2D exitPoint = new Point2D(pipingInput.ExitPointL, surfaceLine.GetZAtL(pipingInput.ExitPointL));
+            CollectionAssert.AreEqual(new[] { exitPoint }, exitPointChartData.Points);
+            Assert.AreEqual(Resources.PipingInput_ExitPointL_DisplayName, exitPointChartData.Name);
+        }
+
         private void AssertCharacteristicPoints(RingtoetsPipingSurfaceLine surfaceLine, IList<ChartData> characteristicPoints)
         {
             Point3D first = surfaceLine.Points.First();