[520881] Fix test that fails on IC server

* Increase height of C1 and move to bottom its label. It seems that on
IC server, the label is not drawn where it must and then it is in
conflict with the created border node.
* Add more info in failing message.

Bug: 520881
Change-Id: Ib26d4667b1e163a0a7866a7bb68ec1b7aa723d8a
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

3 files changed, 7 insertions, 8 deletions

diff --git a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/creation/borderedNode/borderedNode.aird b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/creation/borderedNode/borderedNode.aird
index 47c52445ee..8f3992dc58 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/creation/borderedNode/borderedNode.aird
+++ b/plugins/org.eclipse.sirius.tests.swtbot/data/unit/tools/creation/borderedNode/borderedNode.aird
@@ -7,7 +7,7 @@
         <data xmi:type="notation:Diagram" xmi:id="_83PZoWlnEeKsCtNUNlpK4A" type="Sirius" element="_82_iAGlnEeKsCtNUNlpK4A" measurementUnit="Pixel">
           <children xmi:type="notation:Node" xmi:id="_83QAsGlnEeKsCtNUNlpK4A" type="2001" element="_82_iAWlnEeKsCtNUNlpK4A">
             <children xmi:type="notation:Node" xmi:id="_83QnwGlnEeKsCtNUNlpK4A" type="5002">
-              <layoutConstraint xmi:type="notation:Location" xmi:id="_-RBQAWlnEeKsCtNUNlpK4A" x="87" y="20"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_-RBQAWlnEeKsCtNUNlpK4A" x="87" y="22"/>
             </children>
             <children xmi:type="notation:Node" xmi:id="_83USIGlnEeKsCtNUNlpK4A" type="3003" element="_82_iAmlnEeKsCtNUNlpK4A">
               <styles xmi:type="notation:ShapeStyle" xmi:id="_83USIWlnEeKsCtNUNlpK4A" fontName="Comic Sans MS"/>
@@ -25,7 +25,7 @@
               <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aADaYWr-EeKUzcXlhUGLrg" x="54" y="1" width="1" height="1"/>
             </children>
             <styles xmi:type="notation:ShapeStyle" xmi:id="_83QAsWlnEeKsCtNUNlpK4A" fontName="Comic Sans MS" fontHeight="8"/>
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-RBQAGlnEeKsCtNUNlpK4A" x="70" y="190" width="86" height="36"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-RBQAGlnEeKsCtNUNlpK4A" x="70" y="190" width="86" height="38"/>
           </children>
           <children xmi:type="notation:Node" xmi:id="_83QnwmlnEeKsCtNUNlpK4A" type="2002" element="_82_iBmlnEeKsCtNUNlpK4A">
             <children xmi:type="notation:Node" xmi:id="_83RO0GlnEeKsCtNUNlpK4A" type="5006"/>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BorderedNodeCreationTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BorderedNodeCreationTest.java
index 8b2e6cb35d..09d9606cf0 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BorderedNodeCreationTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BorderedNodeCreationTest.java
@@ -630,15 +630,15 @@ public class BorderedNodeCreationTest extends AbstractSiriusSwtBotGefTestCase {
             boolean nearCollapsedBorderedNode) {
         IGraphicalEditPart borderNodePart = (IGraphicalEditPart) editor.getEditPart(borderedNodeLabel, AbstractDiagramBorderNodeEditPart.class).part();
         Point nodeLocation = editor.getAbsoluteLocation(borderNodePart);
-        String errorMessage = "The BorderedNode has been created at wrong location.";
+        String errorMessage = "the BorderedNode has been created at wrong location.";
         if (nearCollapsedBorderedNode) {
-            errorMessage = "The BorderedNode has been created at wrong location (for near collapsed bordered node case).";
+            errorMessage = "the BorderedNode has been created at wrong location (for near collapsed bordered node case).";
         }
-        // Check Draw2d
-        assertSameLocation(errorMessage, expectedLocation, nodeLocation, parentLocation, creationLocation, parentPart);
         // Check GMF
         Point gmfNodeLocation = GMFHelper.getAbsoluteLocation((Node) borderNodePart.getModel(), true);
-        assertSameLocation(errorMessage, expectedLocation, gmfNodeLocation, parentLocation, creationLocation, parentPart);
+        assertSameLocation("For GMF, " + errorMessage, expectedLocation, gmfNodeLocation, parentLocation, creationLocation, parentPart);
+        // Check Draw2d
+        assertSameLocation("For Draw2d, " + errorMessage, expectedLocation, nodeLocation, parentLocation, creationLocation, parentPart);
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BorderedNodeCreationWithSnapToGridTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BorderedNodeCreationWithSnapToGridTest.java
index 63dac0c0e6..293e198d89 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BorderedNodeCreationWithSnapToGridTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/BorderedNodeCreationWithSnapToGridTest.java
@@ -12,7 +12,6 @@ package org.eclipse.sirius.tests.swtbot;
 
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.draw2d.geometry.PrecisionPoint;
 import org.eclipse.draw2d.geometry.Rectangle;