diff options
author | Pierre-Charles David | 2019-07-02 13:00:16 +0000 |
---|---|---|
committer | Pierre-Charles David | 2019-07-02 13:00:16 +0000 |
commit | d3dd7110338986c21ad804257258c651ea7c397e (patch) | |
tree | 15e310999c8ef4c82f6f3c54fe70bef296fe2666 | |
parent | 0e5ee284800331144e050c7339cb11805d980be1 (diff) | |
download | org.eclipse.sirius-d3dd7110338986c21ad804257258c651ea7c397e.tar.gz org.eclipse.sirius-d3dd7110338986c21ad804257258c651ea7c397e.tar.xz org.eclipse.sirius-d3dd7110338986c21ad804257258c651ea7c397e.zip |
[546681] Fix LinkNoteFragmentModelCreationTest and NoteCreationTest
The SWTBotGefEditor.directEditType(String) we use clearly documents
that it assumes direct edit mode is already enabled. In other contexts
simulating the key presses automatically triggers it, but apparently
when executed inside our Docker image, something in the graphical
stack (X11 server/window manager/version of Gtk) is different, and an
explicit "F2" is needed to trigger direct edit mode.
Bug: 546681
Change-Id: I5ca25d37a353f9c9de83e093555ec6d4921d2248
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
2 files changed, 4 insertions, 1 deletions
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/LinkNoteFragmentModelCreationTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/LinkNoteFragmentModelCreationTest.java index 90c4b70705..4bb26ea59c 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/LinkNoteFragmentModelCreationTest.java +++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/LinkNoteFragmentModelCreationTest.java @@ -24,6 +24,7 @@ import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils; import org.eclipse.sirius.ui.business.api.session.SessionEditorInput; import org.eclipse.sirius.viewpoint.DRepresentationDescriptor; import org.eclipse.sirius.viewpoint.description.Viewpoint; +import org.eclipse.swt.SWT; import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.ui.PartInitException; @@ -101,6 +102,7 @@ public class LinkNoteFragmentModelCreationTest extends AbstractSiriusSwtBotGefTe editor.activateTool(LINK_NOTE_TOOL); editor.click(x, y); selectTargetRepresentation(link); + SWTBotUtils.pressKeyboardKey(editor.getWidget(), SWT.F2); editor.directEditType(MY_NOTE); } diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/NoteCreationTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/NoteCreationTest.java index 6e4d2d6b1f..18cd2aeca3 100644 --- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/NoteCreationTest.java +++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/NoteCreationTest.java @@ -54,6 +54,7 @@ import org.eclipse.sirius.tests.swtbot.support.utils.SWTBotUtils; import org.eclipse.sirius.ui.business.api.session.SessionEditorInput; import org.eclipse.sirius.viewpoint.DRepresentationDescriptor; import org.eclipse.sirius.viewpoint.description.Viewpoint; +import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Image; import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditPart; import org.eclipse.swtbot.swt.finder.SWTBot; @@ -555,7 +556,7 @@ public class NoteCreationTest extends AbstractSiriusSwtBotGefTestCase { if (link != null) { selectTargetRepresentation(link); } - + SWTBotUtils.pressKeyboardKey(editor.getWidget(), SWT.F2); editor.directEditType(MY_NOTE); } |