Bug 538339: [Tests] Some tests are failing due to diagram opening or

closing problem

Change-Id: Idb3dd33a577e617567fcfb1bd6077544dd1d5937
Signed-off-by: Nicolas FAUVERGUE <nicolas.fauvergue@cea.fr>

5 files changed, 161 insertions, 159 deletions

diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/resources/deleteActionUtil/model.di b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/resources/deleteActionUtil/model.di
index fca755937b3..8634d4c00e0 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/resources/deleteActionUtil/model.di
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/resources/deleteActionUtil/model.di
@@ -1,15 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
-    <windows>
-      <children xsi:type="di:TabFolder">
-        <children>
-          <emfPageIdentifier href="model.notation#_BwdpMG86EeSG_p8PAYDlLg"/>
-        </children>
-        <children>
-          <emfPageIdentifier href="model.notation#_-ZPccG8-EeSkzprKqshrgw"/>
-        </children>
-      </children>
-    </windows>
-  </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="UTF-8"?>

+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

diff --git a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/src/org/eclipse/papyrus/infra/gmfdiag/menu/utils/DeleteActionUtilTest.java b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/src/org/eclipse/papyrus/infra/gmfdiag/menu/utils/DeleteActionUtilTest.java
index a150c6a6910..787af1805f9 100644
--- a/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/src/org/eclipse/papyrus/infra/gmfdiag/menu/utils/DeleteActionUtilTest.java
+++ b/tests/junit/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.menu.tests/src/org/eclipse/papyrus/infra/gmfdiag/menu/utils/DeleteActionUtilTest.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2014 CEA LIST.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -19,7 +19,6 @@ import java.util.List;
 
 import org.eclipse.gef.EditPart;
 import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.papyrus.infra.gmfdiag.menu.utils.DeleteActionUtil;
 import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
 import org.eclipse.papyrus.junit.utils.rules.PapyrusEditorFixture;
 import org.eclipse.papyrus.junit.utils.rules.PluginResource;
@@ -57,6 +56,7 @@ public class DeleteActionUtilTest extends AbstractPapyrusTest {
 	@Test
 	public void testDeleteTextNode() {
 		editorFixture.open();
+		editorFixture.openDiagram(CLASS_DIAGRAM_TITLE);
 		EditPart noteNode = editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findOrphanEditPart(NOTE_NOTATION_TYPE);
 		Assert.assertFalse(DeleteActionUtil.isSemanticDeletion((IGraphicalEditPart) noteNode));
 	}
@@ -67,6 +67,7 @@ public class DeleteActionUtilTest extends AbstractPapyrusTest {
 	@Test
 	public void testDeleteOrphan() {
 		editorFixture.open();
+		editorFixture.openDiagram(CLASS_DIAGRAM_TITLE);
 		EditPart orphanNode = editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findOrphanEditPart();
 
 		Assert.assertFalse(DeleteActionUtil.isSemanticDeletion((IGraphicalEditPart) orphanNode));
@@ -78,6 +79,7 @@ public class DeleteActionUtilTest extends AbstractPapyrusTest {
 	@Test
 	public void testDeleteNotOrphanElement() {
 		editorFixture.open();
+		editorFixture.openDiagram(CLASS_DIAGRAM_TITLE);
 		EditPart semanticNode = editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findEditPart(SEMANTIC_ELEMENT_NAME, org.eclipse.uml2.uml.Class.class);
 		Assert.assertTrue(DeleteActionUtil.isSemanticDeletion((IGraphicalEditPart) semanticNode));
 	}
@@ -88,6 +90,7 @@ public class DeleteActionUtilTest extends AbstractPapyrusTest {
 	@Test
 	public void testIsCanonicalWithNote() {
 		editorFixture.open();
+		editorFixture.openDiagram(CLASS_DIAGRAM_TITLE);
 		EditPart orphanNode = editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findOrphanEditPart(NOTE_NOTATION_TYPE);
 		Assert.assertFalse(DeleteActionUtil.isCanonicalEditPart((IGraphicalEditPart) orphanNode));
 	}
@@ -98,6 +101,7 @@ public class DeleteActionUtilTest extends AbstractPapyrusTest {
 	@Test
 	public void testIsCanonicalWithConnection() {
 		editorFixture.open();
+		editorFixture.openDiagram(CLASS_DIAGRAM_TITLE);
 		EditPart connectionNode = editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findEditPart(CONNECTION_ELEMENT_LABEL, org.eclipse.uml2.uml.Dependency.class);
 		Assert.assertFalse(DeleteActionUtil.isCanonicalEditPart((IGraphicalEditPart) connectionNode));
 	}
@@ -108,6 +112,7 @@ public class DeleteActionUtilTest extends AbstractPapyrusTest {
 	@Test
 	public void testIsCanonicalWithOrphan() {
 		editorFixture.open();
+		editorFixture.openDiagram(CLASS_DIAGRAM_TITLE);
 		EditPart orphanNode = editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findOrphanEditPart();
 		Assert.assertFalse(DeleteActionUtil.isCanonicalEditPart((IGraphicalEditPart) orphanNode));
 	}
@@ -118,6 +123,7 @@ public class DeleteActionUtilTest extends AbstractPapyrusTest {
 	@Test
 	public void testIsCanonicalWithNotOrphan() {
 		editorFixture.open();
+		editorFixture.openDiagram(CLASS_DIAGRAM_TITLE);
 		EditPart semanticNode = editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findEditPart(SEMANTIC_ELEMENT_NAME, org.eclipse.uml2.uml.Class.class);
 		Assert.assertFalse(DeleteActionUtil.isCanonicalEditPart((IGraphicalEditPart) semanticNode));
 	}
@@ -128,6 +134,7 @@ public class DeleteActionUtilTest extends AbstractPapyrusTest {
 	@Test
 	public void testIsSupportViewWithOrphan() {
 		editorFixture.open();
+		editorFixture.openDiagram(CLASS_DIAGRAM_TITLE);
 		EditPart orphanNode = editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findOrphanEditPart();
 		Assert.assertTrue(DeleteActionUtil.isSupportView((IGraphicalEditPart) orphanNode));
 	}
@@ -138,6 +145,7 @@ public class DeleteActionUtilTest extends AbstractPapyrusTest {
 	@Test
 	public void testIsSupportViewWithNotOrphan() {
 		editorFixture.open();
+		editorFixture.openDiagram(CLASS_DIAGRAM_TITLE);
 		EditPart semanticNode = editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findEditPart(SEMANTIC_ELEMENT_NAME, org.eclipse.uml2.uml.Class.class);
 		Assert.assertTrue(DeleteActionUtil.isSupportView((IGraphicalEditPart) semanticNode));
 	}
@@ -148,6 +156,7 @@ public class DeleteActionUtilTest extends AbstractPapyrusTest {
 	@Test
 	public void testIsSupportViewWithNote() {
 		editorFixture.open();
+		editorFixture.openDiagram(CLASS_DIAGRAM_TITLE);
 		EditPart noteNode = editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findOrphanEditPart(NOTE_NOTATION_TYPE);
 		Assert.assertTrue(DeleteActionUtil.isSupportView((IGraphicalEditPart) noteNode));
 	}
@@ -158,6 +167,7 @@ public class DeleteActionUtilTest extends AbstractPapyrusTest {
 	@Test
 	public void testIsCanonicalViewWithOrphan() {
 		editorFixture.open();
+		editorFixture.openDiagram(CLASS_DIAGRAM_TITLE);
 		EditPart orphanNode = editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findOrphanEditPart();
 		Assert.assertTrue(DeleteActionUtil.isCanonicalView((IGraphicalEditPart) orphanNode));
 	}
@@ -168,6 +178,7 @@ public class DeleteActionUtilTest extends AbstractPapyrusTest {
 	@Test
 	public void testIsCanonicalViewWithNotOrphan() {
 		editorFixture.open();
+		editorFixture.openDiagram(CLASS_DIAGRAM_TITLE);
 		EditPart semanticNode = editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findEditPart(SEMANTIC_ELEMENT_NAME, org.eclipse.uml2.uml.Class.class);
 		Assert.assertTrue(DeleteActionUtil.isCanonicalView((IGraphicalEditPart) semanticNode));
 	}
@@ -178,6 +189,7 @@ public class DeleteActionUtilTest extends AbstractPapyrusTest {
 	@Test
 	public void testIsCanonicalViewWithNote() {
 		editorFixture.open();
+		editorFixture.openDiagram(CLASS_DIAGRAM_TITLE);
 		EditPart noteNode = editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findOrphanEditPart(NOTE_NOTATION_TYPE);
 		Assert.assertTrue(DeleteActionUtil.isCanonicalView((IGraphicalEditPart) noteNode));
 	}
@@ -189,6 +201,7 @@ public class DeleteActionUtilTest extends AbstractPapyrusTest {
 	public void testIsSupportViews() {
 
 		editorFixture.open();
+		editorFixture.openDiagram(CLASS_DIAGRAM_TITLE);
 		IGraphicalEditPart semanticNode = (IGraphicalEditPart) editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findEditPart(SEMANTIC_ELEMENT_NAME, org.eclipse.uml2.uml.Class.class);
 		IGraphicalEditPart noteNode = (IGraphicalEditPart) editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findOrphanEditPart(NOTE_NOTATION_TYPE);
 		IGraphicalEditPart orphanNode = (IGraphicalEditPart) editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findOrphanEditPart();
@@ -205,6 +218,7 @@ public class DeleteActionUtilTest extends AbstractPapyrusTest {
 	public void testIsCanonical() {
 
 		editorFixture.open();
+		editorFixture.openDiagram(CLASS_DIAGRAM_TITLE);
 		IGraphicalEditPart semanticNode = (IGraphicalEditPart) editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findEditPart(SEMANTIC_ELEMENT_NAME, org.eclipse.uml2.uml.Class.class);
 		IGraphicalEditPart noteNode = (IGraphicalEditPart) editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findOrphanEditPart(NOTE_NOTATION_TYPE);
 		IGraphicalEditPart orphanNode = (IGraphicalEditPart) editorFixture.activateDiagram(CLASS_DIAGRAM_TITLE).findOrphanEditPart();
diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/MarkerDeletionModel.di b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/MarkerDeletionModel.di
index 399b53e6543..8634d4c00e0 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/MarkerDeletionModel.di
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/MarkerDeletionModel.di
@@ -1,15 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
-    <windows>
-      <children xsi:type="di:TabFolder">
-        <children>
-          <emfPageIdentifier href="MarkerDeletionModel.notation#_9Qn2oPL_EeOLftWAUykDGQ"/>
-        </children>
-        <children>
-          <emfPageIdentifier href="MarkerDeletionModel.notation#_BMxjIPMAEeOLftWAUykDGQ"/>
-        </children>
-      </children>
-    </windows>
-  </sashModel>
-</di:SashWindowsMngr>
+<?xml version="1.0" encoding="UTF-8"?>

+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/MarkerDeletionModel.notation b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/MarkerDeletionModel.notation
index a69970fb4dc..852e5ed707d 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/MarkerDeletionModel.notation
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/model/MarkerDeletionModel.notation
@@ -1,126 +1,139 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">
-  <notation:Diagram xmi:id="_9Qn2oPL_EeOLftWAUykDGQ" type="PapyrusUMLClassDiagram" name="classes" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_9yfNkPL_EeOLftWAUykDGQ" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_9ygbsPL_EeOLftWAUykDGQ" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_9ygbsfL_EeOLftWAUykDGQ" type="7017">
-        <children xmi:type="notation:Shape" xmi:id="_1RnG8PMmEeODA689ugv90A" type="3012">
-          <element xmi:type="uml:Property" href="MarkerDeletionModel.uml#_1RlRwPMmEeODA689ugv90A"/>
-          <layoutConstraint xmi:type="notation:Location" xmi:id="_1RnG8fMmEeODA689ugv90A"/>
-        </children>
-        <styles xmi:type="notation:TitleStyle" xmi:id="_9ygbsvL_EeOLftWAUykDGQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_9ygbs_L_EeOLftWAUykDGQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_9ygbtPL_EeOLftWAUykDGQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ygbtfL_EeOLftWAUykDGQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_9ygbtvL_EeOLftWAUykDGQ" type="7018">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_9ygbt_L_EeOLftWAUykDGQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_9ygbuPL_EeOLftWAUykDGQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_9ygbufL_EeOLftWAUykDGQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ygbuvL_EeOLftWAUykDGQ"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_9ygbu_L_EeOLftWAUykDGQ" type="7019">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_9ygbvPL_EeOLftWAUykDGQ"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_9ygbvfL_EeOLftWAUykDGQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_9ygbvvL_EeOLftWAUykDGQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ygbv_L_EeOLftWAUykDGQ"/>
-      </children>
-      <element xmi:type="uml:Class" href="MarkerDeletionModel.uml#_9xz4IPL_EeOLftWAUykDGQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9yfNkfL_EeOLftWAUykDGQ" x="92" y="132"/>
-    </children>
-    <children xmi:type="notation:Shape" xmi:id="_sZYiAPMmEeODA689ugv90A" type="2008">
-      <children xmi:type="notation:DecorationNode" xmi:id="_sZZJEPMmEeODA689ugv90A" type="5029"/>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_sZZJEfMmEeODA689ugv90A" type="7017">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_sZZJEvMmEeODA689ugv90A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_sZZJE_MmEeODA689ugv90A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_sZZJFPMmEeODA689ugv90A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZZJFfMmEeODA689ugv90A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_sZZJFvMmEeODA689ugv90A" type="7018">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_sZZJF_MmEeODA689ugv90A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_sZZJGPMmEeODA689ugv90A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_sZZJGfMmEeODA689ugv90A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZZJGvMmEeODA689ugv90A"/>
-      </children>
-      <children xmi:type="notation:BasicCompartment" xmi:id="_sZZJG_MmEeODA689ugv90A" type="7019">
-        <styles xmi:type="notation:TitleStyle" xmi:id="_sZZJHPMmEeODA689ugv90A"/>
-        <styles xmi:type="notation:SortingStyle" xmi:id="_sZZJHfMmEeODA689ugv90A"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_sZZJHvMmEeODA689ugv90A"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZZJH_MmEeODA689ugv90A"/>
-      </children>
-      <element xmi:type="uml:Class" href="MarkerDeletionModel.uml#_sYrXYPMmEeODA689ugv90A"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZYiAfMmEeODA689ugv90A" x="414" y="142"/>
-    </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_9Qn2ofL_EeOLftWAUykDGQ" name="diagram_compatibility_version" stringValue="1.0.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_9Qn2ovL_EeOLftWAUykDGQ"/>
-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_9Qn2o_L_EeOLftWAUykDGQ">
-      <owner xmi:type="uml:Model" href="MarkerDeletionModel.uml#_9NUrAPL_EeOLftWAUykDGQ"/>
-    </styles>
-    <element xmi:type="uml:Model" href="MarkerDeletionModel.uml#_9NUrAPL_EeOLftWAUykDGQ"/>
-    <edges xmi:type="notation:Connector" xmi:id="_y5HlkPMmEeODA689ugv90A" type="4001" source="_sZYiAPMmEeODA689ugv90A" target="_9yfNkPL_EeOLftWAUykDGQ">
-      <children xmi:type="notation:DecorationNode" xmi:id="_y5Hlk_MmEeODA689ugv90A" type="6001">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_y5IMoPMmEeODA689ugv90A" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_y5IMofMmEeODA689ugv90A" visible="false" type="6002">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_y5IMovMmEeODA689ugv90A" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_y5IMo_MmEeODA689ugv90A" type="6003">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_y5IzsPMmEeODA689ugv90A" y="-20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_y5IzsfMmEeODA689ugv90A" type="6005">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_y5IzsvMmEeODA689ugv90A" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_y5Izs_MmEeODA689ugv90A" type="6033">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_y5IztPMmEeODA689ugv90A" y="20"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_y5JawPMmEeODA689ugv90A" type="6034">
-        <layoutConstraint xmi:type="notation:Location" xmi:id="_y5JawfMmEeODA689ugv90A" y="-20"/>
-      </children>
-      <styles xmi:type="notation:FontStyle" xmi:id="_y5HlkfMmEeODA689ugv90A"/>
-      <element xmi:type="uml:Association" href="MarkerDeletionModel.uml#_y5FJU_MmEeODA689ugv90A"/>
-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_y5HlkvMmEeODA689ugv90A" points="[-18, -2, 272, 5]$[-281, -57, 9, -50]"/>
-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y5xs4PMmEeODA689ugv90A" id="(0.18,0.47)"/>
-    </edges>
-  </notation:Diagram>
-  <notation:Diagram xmi:id="_BMxjIPMAEeOLftWAUykDGQ" type="PapyrusUMLActivityDiagram" name="ActivityDiagram" measurementUnit="Pixel">
-    <children xmi:type="notation:Shape" xmi:id="_BMyKMPMAEeOLftWAUykDGQ" type="2001">
-      <children xmi:type="notation:DecorationNode" xmi:id="_BMyKMfMAEeOLftWAUykDGQ" type="5001"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BMyKMvMAEeOLftWAUykDGQ" type="5002"/>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BMyKM_MAEeOLftWAUykDGQ" type="7001">
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BMyKNPMAEeOLftWAUykDGQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BMyKNfMAEeOLftWAUykDGQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BMyKNvMAEeOLftWAUykDGQ"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BMyKN_MAEeOLftWAUykDGQ" type="7002">
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BMyKOPMAEeOLftWAUykDGQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BMyKOfMAEeOLftWAUykDGQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BMyKOvMAEeOLftWAUykDGQ"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BMyKO_MAEeOLftWAUykDGQ" type="7003">
-        <styles xmi:type="notation:SortingStyle" xmi:id="_BMyKPPMAEeOLftWAUykDGQ"/>
-        <styles xmi:type="notation:FilteringStyle" xmi:id="_BMyKPfMAEeOLftWAUykDGQ"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BMyKPvMAEeOLftWAUykDGQ"/>
-      </children>
-      <children xmi:type="notation:DecorationNode" xmi:id="_BMyKP_MAEeOLftWAUykDGQ" type="7004">
-        <children xmi:type="notation:Shape" xmi:id="_B-bCgPMAEeOLftWAUykDGQ" type="3071">
-          <children xmi:type="notation:DecorationNode" xmi:id="_B-bpkPMAEeOLftWAUykDGQ" type="5121"/>
-          <children xmi:type="notation:DecorationNode" xmi:id="_B-bpkfMAEeOLftWAUykDGQ" type="7010">
-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B-bpkvMAEeOLftWAUykDGQ"/>
-          </children>
-          <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_B-bCgfMAEeOLftWAUykDGQ"/>
-          <element xmi:type="uml:LoopNode" href="MarkerDeletionModel.uml#_B-X_MPMAEeOLftWAUykDGQ"/>
-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B-bCgvMAEeOLftWAUykDGQ" x="55" y="37"/>
-        </children>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BMyKQPMAEeOLftWAUykDGQ"/>
-      </children>
-      <element xmi:type="uml:Activity" href="MarkerDeletionModel.uml#__wImAPL_EeOLftWAUykDGQ"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BMyKQfMAEeOLftWAUykDGQ"/>
-    </children>
-    <styles xmi:type="notation:StringValueStyle" xmi:id="_BMyKQvMAEeOLftWAUykDGQ" name="diagram_compatibility_version" stringValue="1.0.0"/>
-    <styles xmi:type="notation:DiagramStyle" xmi:id="_BMyKQ_MAEeOLftWAUykDGQ"/>
-    <styles xmi:type="style:PapyrusViewStyle" xmi:id="_BMyKRPMAEeOLftWAUykDGQ">
-      <owner xmi:type="uml:Activity" href="MarkerDeletionModel.uml#__wImAPL_EeOLftWAUykDGQ"/>
-    </styles>
-    <element xmi:type="uml:Activity" href="MarkerDeletionModel.uml#__wImAPL_EeOLftWAUykDGQ"/>
-  </notation:Diagram>
-</xmi:XMI>
+<?xml version="1.0" encoding="UTF-8"?>

+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/gmfdiag/style" xmlns:style_1="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML">

+  <notation:Diagram xmi:id="_9Qn2oPL_EeOLftWAUykDGQ" type="PapyrusUMLClassDiagram" name="classes" measurementUnit="Pixel">

+    <children xmi:type="notation:Shape" xmi:id="_9yfNkPL_EeOLftWAUykDGQ" type="Class_Shape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_9ygbsPL_EeOLftWAUykDGQ" type="Class_NameLabel"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_9ygbsfL_EeOLftWAUykDGQ" type="Class_AttributeCompartment">

+        <children xmi:type="notation:Shape" xmi:id="_1RnG8PMmEeODA689ugv90A" type="Property_ClassAttributeLabel">

+          <element xmi:type="uml:Property" href="MarkerDeletionModel.uml#_1RlRwPMmEeODA689ugv90A"/>

+          <layoutConstraint xmi:type="notation:Location" xmi:id="_1RnG8fMmEeODA689ugv90A"/>

+        </children>

+        <styles xmi:type="notation:TitleStyle" xmi:id="_9ygbsvL_EeOLftWAUykDGQ"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="_9ygbs_L_EeOLftWAUykDGQ"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_9ygbtPL_EeOLftWAUykDGQ"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ygbtfL_EeOLftWAUykDGQ"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_9ygbtvL_EeOLftWAUykDGQ" type="Class_OperationCompartment">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_9ygbt_L_EeOLftWAUykDGQ"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="_9ygbuPL_EeOLftWAUykDGQ"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_9ygbufL_EeOLftWAUykDGQ"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ygbuvL_EeOLftWAUykDGQ"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_9ygbu_L_EeOLftWAUykDGQ" type="Class_NestedClassifierCompartment">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_9ygbvPL_EeOLftWAUykDGQ"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="_9ygbvfL_EeOLftWAUykDGQ"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_9ygbvvL_EeOLftWAUykDGQ"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9ygbv_L_EeOLftWAUykDGQ"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_3SbjUKqhEeiDd7O76QzJTw" type="Class_FloatingNameLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3SbjUaqhEeiDd7O76QzJTw" y="5"/>

+      </children>

+      <element xmi:type="uml:Class" href="MarkerDeletionModel.uml#_9xz4IPL_EeOLftWAUykDGQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9yfNkfL_EeOLftWAUykDGQ" x="100" y="140"/>

+    </children>

+    <children xmi:type="notation:Shape" xmi:id="_sZYiAPMmEeODA689ugv90A" type="Class_Shape">

+      <children xmi:type="notation:DecorationNode" xmi:id="_sZZJEPMmEeODA689ugv90A" type="Class_NameLabel"/>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_sZZJEfMmEeODA689ugv90A" type="Class_AttributeCompartment">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_sZZJEvMmEeODA689ugv90A"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="_sZZJE_MmEeODA689ugv90A"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_sZZJFPMmEeODA689ugv90A"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZZJFfMmEeODA689ugv90A"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_sZZJFvMmEeODA689ugv90A" type="Class_OperationCompartment">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_sZZJF_MmEeODA689ugv90A"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="_sZZJGPMmEeODA689ugv90A"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_sZZJGfMmEeODA689ugv90A"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZZJGvMmEeODA689ugv90A"/>

+      </children>

+      <children xmi:type="notation:BasicCompartment" xmi:id="_sZZJG_MmEeODA689ugv90A" type="Class_NestedClassifierCompartment">

+        <styles xmi:type="notation:TitleStyle" xmi:id="_sZZJHPMmEeODA689ugv90A"/>

+        <styles xmi:type="notation:SortingStyle" xmi:id="_sZZJHfMmEeODA689ugv90A"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_sZZJHvMmEeODA689ugv90A"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZZJH_MmEeODA689ugv90A"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_3ScKYKqhEeiDd7O76QzJTw" type="Class_FloatingNameLabel">

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3ScKYaqhEeiDd7O76QzJTw" y="5"/>

+      </children>

+      <element xmi:type="uml:Class" href="MarkerDeletionModel.uml#_sYrXYPMmEeODA689ugv90A"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sZYiAfMmEeODA689ugv90A" x="414" y="142"/>

+    </children>

+    <styles xmi:type="notation:StringValueStyle" xmi:id="_9Qn2ofL_EeOLftWAUykDGQ" name="diagram_compatibility_version" stringValue="1.4.0"/>

+    <styles xmi:type="notation:DiagramStyle" xmi:id="_9Qn2ovL_EeOLftWAUykDGQ"/>

+    <styles xmi:type="style:PapyrusDiagramStyle" xmi:id="_3SdYgKqhEeiDd7O76QzJTw" diagramKindId="org.eclipse.papyrus.uml.diagram.class">

+      <owner xmi:type="uml:Model" href="MarkerDeletionModel.uml#_9NUrAPL_EeOLftWAUykDGQ"/>

+    </styles>

+    <element xmi:type="uml:Model" href="MarkerDeletionModel.uml#_9NUrAPL_EeOLftWAUykDGQ"/>

+    <edges xmi:type="notation:Connector" xmi:id="_y5HlkPMmEeODA689ugv90A" type="Association_Edge" source="_sZYiAPMmEeODA689ugv90A" target="_9yfNkPL_EeOLftWAUykDGQ">

+      <children xmi:type="notation:DecorationNode" xmi:id="_y5Hlk_MmEeODA689ugv90A" type="Association_StereotypeLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4lGsIKqhEeiDd7O76QzJTw" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_y5IMoPMmEeODA689ugv90A" y="-20"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_y5IMofMmEeODA689ugv90A" visible="false" type="Association_NameLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4lUHgKqhEeiDd7O76QzJTw" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_y5IMovMmEeODA689ugv90A" y="20"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_y5IMo_MmEeODA689ugv90A" type="Association_TargetRoleLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4ld4gKqhEeiDd7O76QzJTw" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_y5IzsPMmEeODA689ugv90A" x="29" y="-20"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_y5IzsfMmEeODA689ugv90A" type="Association_SourceRoleLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4loQkKqhEeiDd7O76QzJTw" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_y5IzsvMmEeODA689ugv90A" x="-29" y="20"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_y5Izs_MmEeODA689ugv90A" type="Association_SourceMultiplicityLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4lxagKqhEeiDd7O76QzJTw" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_y5IztPMmEeODA689ugv90A" x="29" y="20"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_y5JawPMmEeODA689ugv90A" type="Association_TargetMultiplicityLabel">

+        <styles xmi:type="notation:BooleanValueStyle" xmi:id="_4l7ykKqhEeiDd7O76QzJTw" name="IS_UPDATED_POSITION" booleanValue="true"/>

+        <layoutConstraint xmi:type="notation:Location" xmi:id="_y5JawfMmEeODA689ugv90A" x="-29" y="-20"/>

+      </children>

+      <styles xmi:type="notation:FontStyle" xmi:id="_y5HlkfMmEeODA689ugv90A"/>

+      <element xmi:type="uml:Association" href="MarkerDeletionModel.uml#_y5FJU_MmEeODA689ugv90A"/>

+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_y5HlkvMmEeODA689ugv90A" points="[-18, -2, 272, 5]$[-281, -57, 9, -50]"/>

+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y5xs4PMmEeODA689ugv90A" id="(0.0,0.38)"/>

+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4mRw0KqhEeiDd7O76QzJTw" id="(1.0,0.47)"/>

+    </edges>

+  </notation:Diagram>

+  <notation:Diagram xmi:id="_BMxjIPMAEeOLftWAUykDGQ" type="PapyrusUMLActivityDiagram" name="ActivityDiagram" measurementUnit="Pixel">

+    <children xmi:type="notation:Shape" xmi:id="_BMyKMPMAEeOLftWAUykDGQ" type="2001">

+      <children xmi:type="notation:DecorationNode" xmi:id="_BMyKMfMAEeOLftWAUykDGQ" type="5001"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_BMyKMvMAEeOLftWAUykDGQ" type="5002"/>

+      <children xmi:type="notation:DecorationNode" xmi:id="_BMyKM_MAEeOLftWAUykDGQ" type="7001">

+        <styles xmi:type="notation:SortingStyle" xmi:id="_BMyKNPMAEeOLftWAUykDGQ"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BMyKNfMAEeOLftWAUykDGQ"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BMyKNvMAEeOLftWAUykDGQ"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_BMyKN_MAEeOLftWAUykDGQ" type="7002">

+        <styles xmi:type="notation:SortingStyle" xmi:id="_BMyKOPMAEeOLftWAUykDGQ"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BMyKOfMAEeOLftWAUykDGQ"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BMyKOvMAEeOLftWAUykDGQ"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_BMyKO_MAEeOLftWAUykDGQ" type="7003">

+        <styles xmi:type="notation:SortingStyle" xmi:id="_BMyKPPMAEeOLftWAUykDGQ"/>

+        <styles xmi:type="notation:FilteringStyle" xmi:id="_BMyKPfMAEeOLftWAUykDGQ"/>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BMyKPvMAEeOLftWAUykDGQ"/>

+      </children>

+      <children xmi:type="notation:DecorationNode" xmi:id="_BMyKP_MAEeOLftWAUykDGQ" type="7004">

+        <children xmi:type="notation:Shape" xmi:id="_B-bCgPMAEeOLftWAUykDGQ" type="3071">

+          <children xmi:type="notation:DecorationNode" xmi:id="_B-bpkPMAEeOLftWAUykDGQ" type="5121"/>

+          <children xmi:type="notation:DecorationNode" xmi:id="_B-bpkfMAEeOLftWAUykDGQ" type="7010">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B-bpkvMAEeOLftWAUykDGQ"/>

+          </children>

+          <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_B-bCgfMAEeOLftWAUykDGQ"/>

+          <element xmi:type="uml:LoopNode" href="MarkerDeletionModel.uml#_B-X_MPMAEeOLftWAUykDGQ"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B-bCgvMAEeOLftWAUykDGQ" x="55" y="37"/>

+        </children>

+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BMyKQPMAEeOLftWAUykDGQ"/>

+      </children>

+      <element xmi:type="uml:Activity" href="MarkerDeletionModel.uml#__wImAPL_EeOLftWAUykDGQ"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BMyKQfMAEeOLftWAUykDGQ"/>

+    </children>

+    <styles xmi:type="notation:StringValueStyle" xmi:id="_BMyKQvMAEeOLftWAUykDGQ" name="diagram_compatibility_version" stringValue="1.0.0"/>

+    <styles xmi:type="notation:DiagramStyle" xmi:id="_BMyKQ_MAEeOLftWAUykDGQ"/>

+    <styles xmi:type="style_1:PapyrusViewStyle" xmi:id="_BMyKRPMAEeOLftWAUykDGQ">

+      <owner xmi:type="uml:Activity" href="MarkerDeletionModel.uml#__wImAPL_EeOLftWAUykDGQ"/>

+    </styles>

+    <element xmi:type="uml:Activity" href="MarkerDeletionModel.uml#__wImAPL_EeOLftWAUykDGQ"/>

+  </notation:Diagram>

+</xmi:XMI>

diff --git a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/edit/advice/MarkerDeletionAdviceTest.java b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/edit/advice/MarkerDeletionAdviceTest.java
index 8b0d26f1ea0..7e004e64d51 100644
--- a/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/edit/advice/MarkerDeletionAdviceTest.java
+++ b/tests/junit/plugins/infra/services/org.eclipse.papyrus.infra.services.edit.tests/src/org/eclipse/papyrus/infra/services/edit/tests/edit/advice/MarkerDeletionAdviceTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014, 2016 CEA, Christian W. Damus, and others.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -155,6 +155,7 @@ public class MarkerDeletionAdviceTest extends AbstractPapyrusTest {
 		MarkerAssertion markers = new MarkerAssertion().add(markerIs("subsetting property '<Property> employee : Person \\Q[0..*]\\E'", IMarker.SEVERITY_WARNING));
 
 		Association association = findElement(Association.class, "A_employer_employee");
+		editor.openDiagram("classes");
 		EditPart editPart = editor.activateDiagram("classes").findEditPart(association);
 
 		execute(new CommandProxy(editPart.getCommand(new EditCommandRequestWrapper(new DestroyElementRequest(false)))));