[test] Reduce code duplication
Change-Id: Iab998d28267e9fb1661a40fefe63107120962aca
Signed-off-by: Maxime PORHEL <maxime.porhel@obeo.fr>
diff --git a/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/AbstractSiriusSwtBotGefTestCase.java b/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/AbstractSiriusSwtBotGefTestCase.java
index e6ddc47..b58003c 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/AbstractSiriusSwtBotGefTestCase.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot.support/src/org/eclipse/sirius/tests/swtbot/support/api/AbstractSiriusSwtBotGefTestCase.java
@@ -55,6 +55,7 @@
import org.eclipse.sirius.business.api.session.SessionManager;
import org.eclipse.sirius.common.tools.internal.resource.ResourceSyncClientNotifier;
import org.eclipse.sirius.diagram.DDiagram;
+import org.eclipse.sirius.diagram.DiagramPackage;
import org.eclipse.sirius.diagram.DiagramPlugin;
import org.eclipse.sirius.diagram.tools.api.preferences.SiriusDiagramCorePreferences;
import org.eclipse.sirius.diagram.tools.api.preferences.SiriusDiagramPreferencesKeys;
@@ -1037,18 +1038,10 @@
@Deprecated
protected SWTBotSiriusDiagramEditor openDiagram(Session session, String diagramDescriptionName, final String diagramName, Class<? extends DRepresentation> expectedRepresentationClass,
boolean disableSnapToGridOnThisEditor) {
- // Get the diagram with this name
- DRepresentation representation = getRepresentationWithName(session, diagramDescriptionName, diagramName);
- TestCase.assertTrue("This representation should be a " + expectedRepresentationClass.getSimpleName(), expectedRepresentationClass.isInstance(representation));
- // Open the corresponding editor
- IEditorPart editorPart = DialectUIManager.INSTANCE.openEditor(session, representation, new NullProgressMonitor());
- SWTBotUtils.waitAllUiEvents();
- // Get the corresponding SWtBotEditor
- SWTBotSiriusDiagramEditor swtBotEditor = SWTBotSiriusHelper.getSiriusDiagramEditor(editorPart.getTitle());
- if (disableSnapToGridOnThisEditor) {
- swtBotEditor.disableSnapToGrid();
- }
- return swtBotEditor;
+ assertTrue("This method is only able to deal with diagrams.", DiagramPackage.Literals.DDIAGRAM.getInstanceClass().isAssignableFrom(expectedRepresentationClass));
+ SWTBotEditor diagramEditor = openRepresentation(session, diagramDescriptionName, diagramName, expectedRepresentationClass, disableSnapToGridOnThisEditor);
+ assertTrue(diagramEditor instanceof SWTBotSiriusDiagramEditor);
+ return (SWTBotSiriusDiagramEditor) diagramEditor;
}
/**
