413129: Attempt Papyrus test fix to support multiple versions
Change-Id: Ic60c5763a3429768bf26d53b15029564f38a7b26
diff --git a/org.eclipse.mylyn.mft.papyrus.tests/src/org/eclipse/mylyn/mft/papyrus/tests/PapyrusDiagramEditorTest.java b/org.eclipse.mylyn.mft.papyrus.tests/src/org/eclipse/mylyn/mft/papyrus/tests/PapyrusDiagramEditorTest.java
index 4941063..5a9544a 100644
--- a/org.eclipse.mylyn.mft.papyrus.tests/src/org/eclipse/mylyn/mft/papyrus/tests/PapyrusDiagramEditorTest.java
+++ b/org.eclipse.mylyn.mft.papyrus.tests/src/org/eclipse/mylyn/mft/papyrus/tests/PapyrusDiagramEditorTest.java
@@ -16,9 +16,11 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
import org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil;
-import org.eclipse.gmf.runtime.notation.impl.ShapeImpl;
+import org.eclipse.gmf.runtime.notation.Shape;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.mylyn.commons.sdk.util.CommonTestUtil;
@@ -85,18 +87,20 @@
IInteractionElement iInteractionElement = ContextCore.getContextManager().getActiveContext().get(RESOURCE_URI);
assertFalse(iInteractionElement.getInterest().isInteresting());
- ShapeImpl bookShape = (ShapeImpl) ed.getEditingDomain()
- .getResourceSet()
- .getResources()
- .get(0)
- .getContents()
- .get(0)
- .eContents()
- .get(0);
-
- ClassImpl book = (ClassImpl) bookShape.getElement();
- String name = book.getName();
- assertEquals("Book", name); //$NON-NLS-1$
+ TreeIterator<EObject> children = ed.getEditingDomain().getResourceSet().getResources().get(0).getAllContents();
+ ClassImpl book = null;
+ while (children.hasNext()) {
+ EObject child = children.next();
+ if (child instanceof Shape) {
+ ClassImpl candidate = (ClassImpl) ((Shape) child).getElement();
+ if (candidate.getName().equals("Book")) {
+ book = candidate;
+ }
+ }
+ }
+ if (book == null) {
+ fail("No shape in content tree");
+ }
List<?> findEditPartsForElement = ed.getDiagramGraphicalViewer().findEditPartsForElement(
EMFCoreUtil.getProxyID(book), ShapeEditPart.class);
