[519044] Fix broken tests on edge.

Corrections on bendpoints leads to broken test on edge because of list
of bendpoints not complete by default and bad use of openDiagram method
for test. 

Bug: 519044
Change-Id: I85fb42d073a9e9479c33300d9a04cdee7993dae8
Signed-off-by: jmallet <jessy.mallet@obeo.fr>

3 files changed, 6 insertions, 4 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/diagram/ConnectionsFactory.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/diagram/ConnectionsFactory.java
index f00062422e..e63fe222f5 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/diagram/ConnectionsFactory.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/internal/refresh/diagram/ConnectionsFactory.java
@@ -348,8 +348,7 @@ public class ConnectionsFactory {
             }
             if (pointList.size() == 0) {
                 // no intersection found, case when source and target are overlapped
-                pointList.addPoint(sourceRefPoint);
-                pointList.addPoint(targetRefPoint);
+                pointList = egdeLayoutData.getPointList();
             }
         }
     }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/routers/RectilinearEdgeUtil.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/routers/RectilinearEdgeUtil.java
index f52301d8dd..08f75c7bff 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/routers/RectilinearEdgeUtil.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/routers/RectilinearEdgeUtil.java
@@ -376,7 +376,7 @@ public final class RectilinearEdgeUtil {
      * @return the line made straight with only necessary points
      */
     public static PointList normalizeToStraightLineTolerance(PointList line, int tolerance) {
-        if (line.size() < 3) {
+        if (line == null || line.size() < 3) {
             // line is too short to be straight
             return line;
         }
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/EdgeCreationPositionTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/EdgeCreationPositionTest.java
index f011035097..647e57cdaf 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/EdgeCreationPositionTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/EdgeCreationPositionTest.java
@@ -92,7 +92,10 @@ public class EdgeCreationPositionTest extends AbstractSiriusSwtBotGefTestCase {
      *            The name of the diagram to open.
      */
     protected void openDiagram(String name) {
-        openDiagram(name, ZoomLevel.ZOOM_100);
+        editor = (SWTBotSiriusDiagramEditor) openRepresentation(localSession.getOpenedSession(),
+                VIEWPOINT_NAME + " " + name, name, DDiagram.class);
+        editor.setSnapToGrid(false);
+        editor.zoom(ZoomLevel.ZOOM_100);
     }
 
     /**