[499370] Fix LabelFontModificationsTest

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

1 files changed, 13 insertions, 1 deletions

diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/AbstractRefreshWithCustomizedStyleTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/AbstractRefreshWithCustomizedStyleTest.java
index ca5984f2f5..4530414f6d 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/AbstractRefreshWithCustomizedStyleTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/AbstractRefreshWithCustomizedStyleTest.java
@@ -826,7 +826,19 @@ public abstract class AbstractRefreshWithCustomizedStyleTest extends AbstractSir
         editor.close();
         SWTBotUtils.waitAllUiEvents();
         editor = (SWTBotSiriusDiagramEditor) openRepresentation(SessionManager.INSTANCE.getSessions().iterator().next(), representationDescriptionName, representationName, DDiagram.class);
-        selectedEditPart = editor.getEditPart(editor.getBounds(selectedEditPart).getCenter(), selectedEditPart.part().getClass());
+        if (DEdgeEditPart.class.isInstance(selectedEditPart.part())) {
+            // Select the corresponding DEdge in the new editor
+            Edge gmfEdge = (Edge) ((DEdgeEditPart) selectedEditPart.part()).getModel();
+            DEdge dEdge = (DEdge) gmfEdge.getElement();
+            selectedEditPart = editor.getEditPart(dEdge.getName(), DEdgeEditPart.class);
+        } else if (DEdgeNameEditPart.class.isInstance(selectedEditPart.part())) {
+            // Select the corresponding DEdge name in the new editor
+            Node gmfNode = (Node) ((DEdgeNameEditPart) selectedEditPart.part()).getModel();
+            DEdge dEdge = (DEdge) gmfNode.getElement();
+            selectedEditPart = editor.getEditPart(dEdge.getName(), DEdgeNameEditPart.class);
+        } else {
+            selectedEditPart = editor.getEditPart(editor.getBounds(selectedEditPart).getCenter(), selectedEditPart.part().getClass());
+        }
         selectedEditPart.select();
 
         resetStyleCustomizationButton = getResetStylePropertiesToDefaultValuesButtonFromTabbar();