Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Schnekenburger2016-08-15 14:03:58 +0000
committerRemi Schnekenburger2016-08-15 14:03:58 +0000
commit73067656754429a6ad666da23d55476dd9278db4 (patch)
treee657618d5f432e883937e772492ee027af28c67d
parent1c9a0a2e8f0741107b2e90b073cc03da15bf3f2b (diff)
downloadorg.eclipse.papyrus-73067656754429a6ad666da23d55476dd9278db4.tar.gz
org.eclipse.papyrus-73067656754429a6ad666da23d55476dd9278db4.tar.xz
org.eclipse.papyrus-73067656754429a6ad666da23d55476dd9278db4.zip
Bug 485342: [Layout] Integrate ELK with Papyrus
This contribution works on the release 0.1 from ELK. It provides JUnit tests on ELK integration (mainly based on an export of the diagram using SVG export facility from Papyrus, and compare with a reference diagram). - add a syserr of the current file to understand better errors in junit report Signed-off-by: Remi Schnekenburger <remi.schnekenburger@cea.fr>
-rw-r--r--tests/junit/extraplugins/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/src/org/eclipse/papyrus/infra/gmfdiag/elk/tests/classdiag/ClassDiagramLayoutTests.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/junit/extraplugins/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/src/org/eclipse/papyrus/infra/gmfdiag/elk/tests/classdiag/ClassDiagramLayoutTests.java b/tests/junit/extraplugins/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/src/org/eclipse/papyrus/infra/gmfdiag/elk/tests/classdiag/ClassDiagramLayoutTests.java
index 20308d44759..bdb2fdab995 100644
--- a/tests/junit/extraplugins/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/src/org/eclipse/papyrus/infra/gmfdiag/elk/tests/classdiag/ClassDiagramLayoutTests.java
+++ b/tests/junit/extraplugins/elk/org.eclipse.papyrus.infra.gmfdiag.elk.tests/src/org/eclipse/papyrus/infra/gmfdiag/elk/tests/classdiag/ClassDiagramLayoutTests.java
@@ -28,7 +28,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.util.List;
@@ -50,13 +49,13 @@ import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.elk.core.service.DiagramLayoutEngine;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.mwe.core.monitor.NullProgressMonitor;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gmf.runtime.common.core.util.Log;
@@ -190,7 +189,7 @@ public class ClassDiagramLayoutTests extends AbstractPapyrusTest {
try {
System.setProperty("line.separator", "\n");
- copyImageUtil.copyToImage(editor.getActiveDiagram(), imagePath, exportParameter.getExportFormat(), new org.eclipse.core.runtime.NullProgressMonitor());
+ copyImageUtil.copyToImage(editor.getActiveDiagram(), imagePath, exportParameter.getExportFormat(), new NullProgressMonitor());
} catch (Throwable e) {
e.printStackTrace();
fail(e.getMessage());

Back to the top