Revert "Bug 516622 - [TimingDiagram] this diagram must deactivated for the"

This reverts commit 5af5635f57f02fdc7e079896c32cc2fb0c1444f5.

Change-Id: Ib46f4266b359500ded25981af91f9ccf7d6bb0a6
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

10 files changed, 54 insertions, 85 deletions

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactLifeline.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactLifeline.java
index 3f7aa2eb1f8..ad09f2b1bbc 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactLifeline.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactLifeline.java
@@ -37,28 +37,24 @@ public class TestTimingDiagramCompactLifeline extends AbstractTimingDiagramTestC
 		createDefaultInteraction();

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testCreateLifeline() {

 		createCompactLifelineInDefaultInteraction();

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testHideLifeline() {

 		final CompactLifelineEditPartCN lifelineEditPart = createCompactLifelineInDefaultInteraction();

 		testHide(lifelineEditPart);

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testDeleteLifeline() {

 		final CompactLifelineEditPartCN lifelineEditPart = createCompactLifelineInDefaultInteraction();

 		testDelete(lifelineEditPart);

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testDropLifeline() {

 		// create a compact Lifeline and hide its View, so as to be able to drop it after that

 		final CompactLifelineEditPartCN lifelineEditPart = createCompactLifelineInDefaultInteraction();

@@ -68,8 +64,7 @@ public class TestTimingDiagramCompactLifeline extends AbstractTimingDiagramTestC
 		testDrop(getDefaultInteractionCompartment(), getDefaultInteractionCompartment(), lifeline);

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testCellEditorLocator() {

 		final CompactLifelineEditPartCN lifelineEditPart = createCompactLifelineInDefaultInteraction();

 		final CompactLifelineNameEditPart compactLifelineNameEditPart = (CompactLifelineNameEditPart)EditPartUtils.findFirstChildEditPartWithId(lifelineEditPart, CompactLifelineNameEditPart.VISUAL_ID);

@@ -79,7 +74,7 @@ public class TestTimingDiagramCompactLifeline extends AbstractTimingDiagramTestC
 	}

 

 	@FailingTest("To be verified - Issue with opening the Text widget for direct edit request. Works in standard user environment")

-	@Test
+	@Test

 	public void testEditLifelineName() {

 		final CompactLifelineEditPartCN lifelineEditPart = createCompactLifelineInDefaultInteraction();

 		final CompactLifelineNameEditPart compactLifelineNameEditPart = (CompactLifelineNameEditPart)EditPartUtils.findFirstChildEditPartWithId(lifelineEditPart, CompactLifelineNameEditPart.VISUAL_ID);

@@ -87,8 +82,7 @@ public class TestTimingDiagramCompactLifeline extends AbstractTimingDiagramTestC
 		testSetNameWithDirectEditRequest(compactLifelineNameEditPart, namedElement);

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void create3LifelinesTest() {

 		final EditPart interactionCompartment = getDefaultInteractionCompartment();

 		assertNotNull("The interaction compartment was not found", interactionCompartment);

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactOccurrenceSpecification.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactOccurrenceSpecification.java
index 86a4555d17a..038ce64fc8f 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactOccurrenceSpecification.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactOccurrenceSpecification.java
@@ -46,7 +46,7 @@ public class TestTimingDiagramCompactOccurrenceSpecification extends AbstractTim
 	}

 

 	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test
+	@Test

 	public void testCreateThreeOccurrenceSpecifications() {

 		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

 		final View interactionView = (View)getDefaultInteractionEditPart().getModel();

@@ -60,7 +60,7 @@ public class TestTimingDiagramCompactOccurrenceSpecification extends AbstractTim
 	}

 

 	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test
+	@Test

 	public void testDeleteOccurrenceSpecification() {

 		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

 		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecifications = findOccurrenceSpecificationsInDefaultCompactLifeline();

@@ -97,8 +97,7 @@ public class TestTimingDiagramCompactOccurrenceSpecification extends AbstractTim
 		checkSimpleCompactTimelinePattern("-o-o-");

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testCreateOccurrenceSpecificationWithDoubleClick() {

 		final CompactStateInvariantEditPartCN stateInvariantEditPart = (CompactStateInvariantEditPartCN)EditPartUtils.findFirstChildEditPartWithId(getDefaultCompactLifelineEditPart(), CompactStateInvariantEditPartCN.VISUAL_ID);

 		assertNotNull("A StateInvariant must always exist", stateInvariantEditPart);

@@ -132,7 +131,7 @@ public class TestTimingDiagramCompactOccurrenceSpecification extends AbstractTim
 	}

 

 	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test
+	@Test

 	public void testMoveOccurrenceSpecification() {

 		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

 		flushEventLoop();

@@ -195,7 +194,7 @@ public class TestTimingDiagramCompactOccurrenceSpecification extends AbstractTim
 	 * the future positions of the elements being moved.

 	 */

 	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test
+	@Test

 	public void testMoveAdjacentOccurrenceSpecifications() {

 		// create two OccurrenceSpecifications close to each other

 		createOccurrenceSpecificationInLastCompactStateInvariantAtAbsolutePos(1, 100);

@@ -224,8 +223,7 @@ public class TestTimingDiagramCompactOccurrenceSpecification extends AbstractTim
 		assertTrue("The second OccurrenceSpecification should always be before the third", boundsAfter.x < maxX);

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testFullUndoRedo() {

 		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

 		// 3 OccurrenceSpecifications + 1 Lifeline + 1 Interaction

@@ -234,7 +232,7 @@ public class TestTimingDiagramCompactOccurrenceSpecification extends AbstractTim
 	}

 

 	@FailingTest("To be verified. Seems to fail on both Hudson and standard user environment")

-	@Test
+	@Test

 	public void testCreateOccurrenceSpecificationOnCompactStateInvariant() {

 		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

 		flushEventLoop();

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactStateInvariant.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactStateInvariant.java
index b11d87344a6..06d813d89dd 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactStateInvariant.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramCompactStateInvariant.java
@@ -45,7 +45,7 @@ public class TestTimingDiagramCompactStateInvariant extends AbstractTimingDiagra
 	}

 

 	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test
+	@Test

 	public void testCutCompactStateInvariants() {

 		final List<CompactStateInvariantEditPartCN> stateInvariantEditParts = findStateInvariantsInDefaultCompactLifeline();

 		assertEquals("We should have one StateInvariant at the beginning of this test", 1, stateInvariantEditParts.size());

@@ -59,7 +59,7 @@ public class TestTimingDiagramCompactStateInvariant extends AbstractTimingDiagra
 	}

 

 	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test
+	@Test

 	public void testEditCompactStateInvariantName() {

 		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

 		checkSimpleCompactTimelinePattern("-o-o-o-");

@@ -83,7 +83,7 @@ public class TestTimingDiagramCompactStateInvariant extends AbstractTimingDiagra
 		checkCompactTimelinePattern("StateInvariant(state2);OccurrenceSpecification(state2_1_To_state1_1);StateInvariant(state1);" + "OccurrenceSpecification(state1_1_To_state2_2);StateInvariant(state2);OccurrenceSpecification(state2_2_To_state1_2);StateInvariant(state1);");

 	}

 

-	@Test
+	@Test

 	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

 	public void testDeleteStateInvariants() {

 		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

@@ -102,7 +102,7 @@ public class TestTimingDiagramCompactStateInvariant extends AbstractTimingDiagra
 	}

 

 	@FailingTest("To be verified. Seems to be failing in all environments; not related to the DirectEdit issue")

-	@Test
+	@Test

 	public void testDeleteStateInvariantsWithOccurrencesOnTop() {

 		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

 		checkInteractionFragmentsWithPattern("-o-o-o-");

@@ -139,7 +139,7 @@ public class TestTimingDiagramCompactStateInvariant extends AbstractTimingDiagra
 	}

 

 	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test
+	@Test

 	public void testHideStateInvariants() {

 		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

 		checkInteractionFragmentsWithPattern("-o-o-o-");

@@ -156,8 +156,7 @@ public class TestTimingDiagramCompactStateInvariant extends AbstractTimingDiagra
 		checkSimpleCompactTimelinePattern("-o-o-");

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testCannotDeleteLastStateInvariant() {

 		checkInteractionFragmentsWithPattern("-");

 		checkSimpleCompactTimelinePattern("-");

@@ -167,8 +166,7 @@ public class TestTimingDiagramCompactStateInvariant extends AbstractTimingDiagra
 		assertFalse("We shouldn't be able to delete the last state invariant", command.canExecute());

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testCannotHideLastStateInvariant() {

 		checkInteractionFragmentsWithPattern("-");

 		checkSimpleCompactTimelinePattern("-");

@@ -180,7 +178,7 @@ public class TestTimingDiagramCompactStateInvariant extends AbstractTimingDiagra
 	}

 

 	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test
+	@Test

 	public void testResizeCompactStateInvariant() {

 		createThreeOccurrenceSpecificationsInDefaultCompactLifeline();

 		flushEventLoop();

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifeline.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifeline.java
index 708db7f5c94..a6b38b006fb 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifeline.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifeline.java
@@ -37,28 +37,24 @@ public class TestTimingDiagramFullLifeline extends AbstractTimingDiagramTestCase
 		createDefaultInteraction();

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testCreateLifeline() {

 		createFullLifelineInDefaultInteraction();

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testHideLifeline() {

 		final FullLifelineEditPartCN lifelineEditPart = createFullLifelineInDefaultInteraction();

 		testHide(lifelineEditPart);

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testDeleteLifeline() {

 		final FullLifelineEditPartCN lifelineEditPart = createFullLifelineInDefaultInteraction();

 		testDelete(lifelineEditPart);

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testDropLifeline() {

 		// create a Lifeline and hide its View, so as to be able to drop it after that

 		final FullLifelineEditPartCN lifelineEditPart = createFullLifelineInDefaultInteraction();

@@ -68,8 +64,7 @@ public class TestTimingDiagramFullLifeline extends AbstractTimingDiagramTestCase
 		testDrop(getDefaultInteractionCompartment(), getDefaultInteractionCompartment(), lifeline);

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testCellEditorLocator() {

 		final FullLifelineEditPartCN lifelineEditPart = createFullLifelineInDefaultInteraction();

 		final FullLifelineNameEditPart fullLifelineNameEditPart = (FullLifelineNameEditPart)EditPartUtils.findFirstChildEditPartWithId(lifelineEditPart, FullLifelineNameEditPart.VISUAL_ID);

@@ -79,7 +74,7 @@ public class TestTimingDiagramFullLifeline extends AbstractTimingDiagramTestCase
 	}

 

 	@FailingTest("To be verified - Issue with opening the Text widget for direct edit request. Works in standard user environment")

-	@Test
+	@Test

 	public void testEditLifelineName() {

 		final FullLifelineEditPartCN lifelineEditPart = createFullLifelineInDefaultInteraction();

 		final FullLifelineNameEditPart lifelineNameEditPart = (FullLifelineNameEditPart)EditPartUtils.findFirstChildEditPartWithId(lifelineEditPart, FullLifelineNameEditPart.VISUAL_ID);

@@ -87,8 +82,7 @@ public class TestTimingDiagramFullLifeline extends AbstractTimingDiagramTestCase
 		testSetNameWithDirectEditRequest(lifelineNameEditPart, namedElement);

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void create3LifelinesTest() {

 		final EditPart interactionCompartment = getDefaultInteractionCompartment();

 		assertNotNull("The interaction compartment was not found", interactionCompartment);

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifelineLayout.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifelineLayout.java
index 42c878a01f9..742005ce9c6 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifelineLayout.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullLifelineLayout.java
@@ -24,7 +24,7 @@ public class TestTimingDiagramFullLifelineLayout extends AbstractTimingDiagramTe
 	 * modifications of the layout.

 	 */

 	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test
+	@Test

 	public void testStateDefinitionsLayout() {

 		final Point interactionLocation = new Point(12, 17);

 		final Dimension interactionSize = new Dimension(867, 729);

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullOccurrenceSpecification.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullOccurrenceSpecification.java
index 75bcfa582ac..edb3aeaf21e 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullOccurrenceSpecification.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullOccurrenceSpecification.java
@@ -47,8 +47,7 @@ public class TestTimingDiagramFullOccurrenceSpecification extends AbstractTiming
 		createThreeStateDefinitionsInDefaultFullLifeline();

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testModelWithThreeOccurrenceSpecifications() {

 		createThreeOccurrenceSpecificationsInDefaultFullLifeline();

 		final View interactionView = (View)getDefaultInteractionEditPart().getModel();

@@ -60,8 +59,7 @@ public class TestTimingDiagramFullOccurrenceSpecification extends AbstractTiming
 		checkInteractionFragmentsWithPattern("-o-o-o-");

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testDeleteOccurrenceSpecification() {

 		createThreeOccurrenceSpecificationsInDefaultFullLifeline();

 		final List<OccurrenceSpecificationEditPartCN> occurrenceSpecifications = findOccurrenceSpecificationsInDefaultFullLifeline();

@@ -94,8 +92,7 @@ public class TestTimingDiagramFullOccurrenceSpecification extends AbstractTiming
 		checkInteractionFragmentsWithPattern("-o-o-");

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testCreateOccurrenceSpecificationWithDoubleClick() {

 		final FullStateInvariantEditPartCN stateInvariantEditPart = (FullStateInvariantEditPartCN)EditPartUtils.findFirstChildEditPartWithId(getDefaultFullLifelineEditPart(), FullStateInvariantEditPartCN.VISUAL_ID);

 		assertNotNull("A StateInvariant must always exist", stateInvariantEditPart);

@@ -130,7 +127,7 @@ public class TestTimingDiagramFullOccurrenceSpecification extends AbstractTiming
 	}

 

 	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test
+	@Test

 	public void testCreateOccurrenceSpecificationWithPaletteTool() {

 		// let GMF do its layout (in order for the Figure coordinates to be set)

 		flushEventLoop();

@@ -155,7 +152,7 @@ public class TestTimingDiagramFullOccurrenceSpecification extends AbstractTiming
 	}

 

 	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test
+	@Test

 	public void testMoveOccurrenceSpecification() {

 		createThreeOccurrenceSpecificationsInDefaultFullLifeline();

 		flushEventLoop();

@@ -218,7 +215,7 @@ public class TestTimingDiagramFullOccurrenceSpecification extends AbstractTiming
 	 * the future positions of the elements being moved.

 	 */

 	@FailingTest("To be verified. Seems to work for standard user, but not in raw test environment")

-	@Test
+	@Test

 	public void testMoveAdjacentOccurrenceSpecifications() {

 		// create two OccurrenceSpecifications close to each other

 		createOccurrenceSpecificationInLastFullStateInvariantAtAbsolutePos(1, 100);

@@ -248,14 +245,12 @@ public class TestTimingDiagramFullOccurrenceSpecification extends AbstractTiming
 	}

 

 	@Ignore("Test is not implemented")

-	@Test
-@FailingTest

+	@Test

 	public void testMoveVerticalLine() {

 		// TODO: test that moving a vertical line moves the preceding occurrence specification

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testFullUndoRedo() {

 		createThreeOccurrenceSpecificationsInDefaultFullLifeline();

 		// 3 OccurrenceSpecifications + 3 StateDefinitions + 1 Lifeline + 1 Interaction

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullStateInvariant.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullStateInvariant.java
index 84ccad05116..1b92996d7f8 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullStateInvariant.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramFullStateInvariant.java
@@ -33,7 +33,7 @@ public class TestTimingDiagramFullStateInvariant extends AbstractTimingDiagramTe
 	}

 

 	@FailingTest("To be verified - Issue with opening the Text widget for direct edit request. Works in standard user environment")

-	@Test
+	@Test

 	public void testMoveStateInvariants() {

 		final List<FullStateInvariantEditPartCN> stateInvariantEditParts = findStateInvariantsInDefaultFullLifeline();

 		assertEquals("We should have 4 StateInvariants at the beginning of this test", 4, stateInvariantEditParts.size());

@@ -71,8 +71,7 @@ public class TestTimingDiagramFullStateInvariant extends AbstractTimingDiagramTe
 		checkFullTimelinePattern("StateInvariant(State 2);OccurrenceSpecification(State 2_1_To_State 1_1);VerticalLine;" + "StateInvariant(State 1);OccurrenceSpecification(State 1_1_To_State 2_2);VerticalLine;" + "StateInvariant(State 2);OccurrenceSpecification(State 2_2_To_State 3_1);VerticalLine;StateInvariant(State 3);");

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testDeleteStateInvariants() {

 		checkInteractionFragmentsWithPattern("-o-o-o-");

 		checkSimpleFullTimelinePattern("-o|-o|-o|-");

@@ -88,8 +87,7 @@ public class TestTimingDiagramFullStateInvariant extends AbstractTimingDiagramTe
 		checkSimpleFullTimelinePattern("-o|-o|-");

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testHideStateInvariants() {

 		checkInteractionFragmentsWithPattern("-o-o-o-");

 		checkSimpleFullTimelinePattern("-o|-o|-o|-");

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramInteraction.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramInteraction.java
index 51956c5d3a8..33d1aef3d33 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramInteraction.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramInteraction.java
@@ -29,28 +29,24 @@ public class TestTimingDiagramInteraction extends AbstractTimingDiagramTestCase
 		super.setUp();

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testCreateInteraction() {

 		createInteraction();

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testHideInteraction() {

 		final InteractionEditPartTN interaction = createInteraction();

 		testHide(interaction);

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testDeleteInteraction() {

 		final InteractionEditPartTN interaction = createInteraction();

 		testDelete(interaction);

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testDropInteraction() {

 		// create an Interaction and hide its View, so as to be able to drop it after that

 		final InteractionEditPartTN interactionEditPart = createInteraction();

@@ -61,8 +57,7 @@ public class TestTimingDiagramInteraction extends AbstractTimingDiagramTestCase
 		testDrop(getDiagramEditPart(), getDiagramEditPart(), interaction);

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testCreateThreeInteractions() {

 		final InteractionEditPartTN interaction1 = createInteraction();

 		final InteractionEditPartTN interaction2 = createInteraction();

@@ -74,7 +69,7 @@ public class TestTimingDiagramInteraction extends AbstractTimingDiagramTestCase
 	}

 

 	@FailingTest("To be verified - Issue with opening the Text widget for direct edit request. Works in standard user environment")

-	@Test
+	@Test

 	public void testEditInteractionName() {

 		final InteractionEditPartTN interactionEditPart = createInteraction();

 		final InteractionNameEditPart interactionNameEditPart = (InteractionNameEditPart)EditPartUtils.findFirstChildEditPartWithId(interactionEditPart, InteractionNameEditPart.VISUAL_ID);

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramMessages.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramMessages.java
index b3efc082436..643ce656644 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramMessages.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramMessages.java
@@ -27,7 +27,7 @@ public class TestTimingDiagramMessages extends AbstractTimingDiagramTestCase {
 	}

 

 	@FailingTest("To be verified: NPE on the text widget")

-	@Test
+	@Test

 	public void testCreateSyncMessage() {

 		clickTwiceWithTool("createMessageSyncCreationTool", findOccurrenceSpecificationsInDefaultFullLifeline().get(0), findOccurrenceSpecificationsInDefaultCompactLifeline().get(1));

 		final Text text = findVisibleTextWidgetOnDiagram();

@@ -42,7 +42,7 @@ public class TestTimingDiagramMessages extends AbstractTimingDiagramTestCase {
 	}

 

 	@FailingTest("To be verified: NPE on the text widget")

-	@Test
+	@Test

 	public void testCreateAsyncMessage() {

 		clickTwiceWithTool("createMessageAsyncCreationTool", findOccurrenceSpecificationsInDefaultFullLifeline().get(0), findOccurrenceSpecificationsInDefaultCompactLifeline().get(1));

 		final Text text = findVisibleTextWidgetOnDiagram();

diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramStateDefinition.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramStateDefinition.java
index 416240db40f..cf7e43e9851 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramStateDefinition.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing.tests/src/org/eclipse/papyrus/uml/diagram/timing/tests/canonical/TestTimingDiagramStateDefinition.java
@@ -54,8 +54,7 @@ public class TestTimingDiagramStateDefinition extends AbstractTimingDiagramTestC
 		createDefaultFullLifeline();

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testCreateStateDefinition() {

 		final EditPart stateDefinition = createStateDefinitionInDefaultFullLifeline();

 		final EditPart stateInvariantEditPart = EditPartUtils.findFirstChildEditPartWithId(getDefaultFullLifelineEditPart(), FullStateInvariantEditPartCN.VISUAL_ID);

@@ -69,8 +68,7 @@ public class TestTimingDiagramStateDefinition extends AbstractTimingDiagramTestC
 

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testCreateMultipleStateDefinitions() {

 		createStateDefinitionInDefaultFullLifeline();

 		expectNStateDefinitions(1);

@@ -97,7 +95,7 @@ public class TestTimingDiagramStateDefinition extends AbstractTimingDiagramTestC
 	 * because we customized this tool).

 	 */

 	@FailingTest("To be verified. Seems to be related to the DirectEdit issue (Text widget not found)")

-	@Test
+	@Test

 	public void testCreateStateDefinitionWithPaletteTool() {

 		final FullLifelineStateDefinitionCompartmentEditPartCN stateDefinitionCompartment = getDefaultStateDefinitionCompartment();

 		// let GMF do its layout

@@ -162,8 +160,7 @@ public class TestTimingDiagramStateDefinition extends AbstractTimingDiagramTestC
 		}

 	}

 

-	@Test
-@FailingTest

+	@Test

 	public void testDeleteStateDefinition() {

 		final EditPart stateDefinition1 = createStateDefinitionInDefaultFullLifeline();

 		final EditPart stateDefinition2 = createStateDefinitionInDefaultFullLifeline();

@@ -210,7 +207,7 @@ public class TestTimingDiagramStateDefinition extends AbstractTimingDiagramTestC
 	}

 

 	@FailingTest("To be verified. Seems to be related to the DirectEdit issue (Text widget not found)")

-	@Test
+	@Test

 	public void testEditStateDefinitionName() {

 		final EditPart stateDefinition = createStateDefinitionInDefaultFullLifeline();

 		final StateDefinitionLabelEditPart stateDefinitionLabelEditPart = getStateDefinitionLabelEditPart(stateDefinition);