[454902] Backport work in regard to gerrit test suites from master

Bug: 454902
Change-Id: If0454c5501715e7ef274e86900e7b6279848ca81
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

12 files changed, 527 insertions, 117 deletions

diff --git a/packaging/org.eclipse.sirius.tests.parent/pom.xml b/packaging/org.eclipse.sirius.tests.parent/pom.xml
index 7693beeb92..0afe86c5f0 100644
--- a/packaging/org.eclipse.sirius.tests.parent/pom.xml
+++ b/packaging/org.eclipse.sirius.tests.parent/pom.xml
@@ -18,6 +18,7 @@
 
   <groupId>org.eclipse.sirius</groupId>
   <artifactId>sirius-tests-parent</artifactId>
+  <version>2.0.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Sirius Tests Parent</name>
@@ -55,6 +56,7 @@
     <tests.junit.include />
     <tests.swtbot.include />
     <tests.swtbot-sequence.include />
+    <tests.ignoreFailures>true</tests.ignoreFailures>
   </properties>
 
   <modules>
@@ -134,7 +136,20 @@
         <tests.junit.skip>false</tests.junit.skip>
         <tests.timeout>${tests.timeout.junit}</tests.timeout>
         <tests.junit.include>%regex[org/eclipse/sirius/tests/suite(/tree)?/AllSiriusTestSuite\.class]</tests.junit.include>
-        <tests.vmargs>${tests.vmargs.mac} -Xmx1024m -XX:MaxPermSize=256m</tests.vmargs>
+        <tests.vmargs>${tests.vmargs.mac} -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+      </properties>
+    </profile>
+     <profile>
+      <id>gerrit-junit</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <tests.junit.skip>false</tests.junit.skip>
+        <tests.timeout>${tests.timeout.junit}</tests.timeout>
+        <tests.junit.include>%regex[org/eclipse/sirius/tests/suite/(tree/AllSiriusTestSuite|GerritJUnitSuite)\.class]</tests.junit.include>
+        <tests.vmargs>${tests.vmargs.mac} -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+        <tests.ignoreFailures>false</tests.ignoreFailures>
       </properties>
     </profile>
     <profile>
@@ -146,7 +161,44 @@
         <tests.swtbot.skip>false</tests.swtbot.skip>
         <tests.timeout>${tests.timeout.swtbot}</tests.timeout>
         <tests.swtbot.include>org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.class</tests.swtbot.include>
-        <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m</tests.vmargs>
+        <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+      </properties>
+    </profile>
+    <profile>
+      <id>swtbot-part1</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <tests.swtbot.skip>false</tests.swtbot.skip>
+        <tests.timeout>${tests.timeout.swtbot}</tests.timeout>
+        <tests.swtbot.include>org/eclipse/sirius/tests/swtbot/suite/SWTBotPart1Suite.class</tests.swtbot.include>
+        <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+      </properties>
+    </profile>
+    <profile>
+      <id>swtbot-part2</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <tests.swtbot.skip>false</tests.swtbot.skip>
+        <tests.timeout>${tests.timeout.swtbot}</tests.timeout>
+        <tests.swtbot.include>org/eclipse/sirius/tests/swtbot/suite/SWTBotPart2Suite.class</tests.swtbot.include>
+        <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+      </properties>
+    </profile>
+    <profile>
+      <id>gerrit-swtbot</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <tests.swtbot.skip>false</tests.swtbot.skip>
+        <tests.timeout>${tests.timeout.swtbot}</tests.timeout>
+        <tests.swtbot.include>org/eclipse/sirius/tests/swtbot/suite/GerritSWTBotSuite.class</tests.swtbot.include>
+        <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+        <tests.ignoreFailures>false</tests.ignoreFailures>
       </properties>
     </profile>
     <profile>
@@ -158,7 +210,20 @@
         <tests.swtbot.skip>false</tests.swtbot.skip>
         <tests.timeout>${tests.timeout.swtbot-sequence}</tests.timeout>
         <tests.swtbot-sequence.include>org/eclipse/sirius/tests/swtbot/suite/SequenceSwtBotTestSuite.class</tests.swtbot-sequence.include>
-        <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m</tests.vmargs>
+        <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+      </properties>
+    </profile>
+    <profile>
+      <id>gerrit-swtbot-sequence</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <tests.swtbot.skip>false</tests.swtbot.skip>
+        <tests.timeout>${tests.timeout.swtbot-sequence}</tests.timeout>
+        <tests.swtbot-sequence.include>org/eclipse/sirius/tests/swtbot/suite/GerritSequenceSWTBotSuite.class</tests.swtbot-sequence.include>
+        <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+        <tests.ignoreFailures>false</tests.ignoreFailures>
       </properties>
     </profile>
   </profiles>
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/AllSiriusTestSuite.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/AllSiriusTestSuite.java
index 3a9b6e1f76..775500b978 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/AllSiriusTestSuite.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/AllSiriusTestSuite.java
@@ -34,19 +34,30 @@ public class AllSiriusTestSuite extends TestCase {
     }
 
     /**
-     * Creates the {@link junit.framework.TestSuite TestSuite} for all the test.
+     * Add the gerrit part of the Junit tests to the specified suite.
      * 
-     * @return The testsuite containing all the tests
+     * @param suite
+     *            the suite into which to add the tests.
      */
-    public static Test suite() {
-        final TestSuite suite = new TestSuite("Sirius tests");
+    public static void addGerritPart(TestSuite suite) {
         suite.addTest(AllCommonStandaloneTests.suite());
         suite.addTest(AllTableStandaloneTests.suite());
         suite.addTest(AllDiagramStandaloneTests.suite());
-
-        suite.addTest(AllCommonPluginTests.suite());
+        AllCommonPluginTests.addGerritPart(suite);
         suite.addTest(AllTablePluginTests.suite());
-        suite.addTest(AllDiagramPluginsTests.suite());
+        AllDiagramPluginsTests.addGerritPart(suite);
+    }
+
+    /**
+     * Creates the {@link junit.framework.TestSuite TestSuite} for all the test.
+     * 
+     * @return The testsuite containing all the tests
+     */
+    public static Test suite() {
+        final TestSuite suite = new TestSuite("Sirius tests");
+        addGerritPart(suite);
+        AllCommonPluginTests.addNonGerritPart(suite);
+        AllDiagramPluginsTests.addNonGerritPart(suite);
         return suite;
     }
 
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/GerritJUnitSuite.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/GerritJUnitSuite.java
new file mode 100644
index 0000000000..a2510687b0
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/GerritJUnitSuite.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.tests.suite;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+/**
+ * Sirius Gerrit Junit Tests.
+ * 
+ * @author fbarbin
+ */
+public class GerritJUnitSuite extends TestCase {
+
+    /**
+     * Launches the test with the given arguments.
+     * 
+     * @param args
+     *            Arguments of the testCase.
+     */
+    public static void main(final String[] args) {
+        TestRunner.run(suite());
+    }
+
+    /**
+     * Creates the {@link junit.framework.TestSuite TestSuite} for all the test.
+     * 
+     * @return The testsuite containing all the tests
+     */
+    public static Test suite() {
+        TestSuite suite = new TestSuite("Sirius Gerrit JUnit Tests");
+        AllSiriusTestSuite.addGerritPart(suite);
+        return suite;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java
index c48abe3fa5..f5a9262db4 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/common/AllCommonPluginTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -131,13 +131,12 @@ public class AllCommonPluginTests extends TestCase {
     }
 
     /**
-     * Creates the {@link junit.framework.TestSuite TestSuite} for all the test.
+     * Add the gerrit part of the Junit tests to the specified suite.
      * 
-     * @return The testsuite containing all the tests
+     * @param suite
+     *            the suite into which to add the tests.
      */
-    public static Test suite() {
-        final TestSuite suite = new TestSuite("Common Plugin Tests");
-
+    public static void addGerritPart(TestSuite suite) {
         suite.addTestSuite(RefreshEditorsPrecommitListenerTests.class);
         suite.addTestSuite(EqualityHelperTestCase.class);
         suite.addTestSuite(WorkspaceResourceSyncTestCase.class);
@@ -160,7 +159,6 @@ public class AllCommonPluginTests extends TestCase {
         suite.addTestSuite(RepairMigrateLostDiagramElementsTC1Test.class);
         suite.addTestSuite(RepairMigrateLostDiagramElementsTC2Test.class);
         suite.addTestSuite(RepairMigratePinStatusTest.class);
-        suite.addTestSuite(RepairWithActivatedFiltersTest.class);
         // suite.addTestSuite(EdgeStyleDescriptionAndEdgeStyleMigrationTests.class);
         suite.addTestSuite(FragmentedFilesMigrationTest.class);
         suite.addTestSuite(MigrationOfCollapsedBorderedNodeTest.class);
@@ -213,7 +211,6 @@ public class AllCommonPluginTests extends TestCase {
         suite.addTestSuite(SampleSessionTest.class);
         suite.addTestSuite(SiriusRegistryTests.class);
         suite.addTestSuite(SiriusRegistryListener2Tests.class);
-        suite.addTestSuite(SessionManagerListener2Tests.class);
         suite.addTestSuite(SessionSemanticResourceTests.class);
         suite.addTestSuite(SessionServiceTest.class);
 
@@ -239,7 +236,6 @@ public class AllCommonPluginTests extends TestCase {
 
         suite.addTestSuite(CreateCellToolInterpreterTest.class);
         suite.addTestSuite(AcceleoMTLInterpreterTests.class);
-        suite.addTestSuite(AcceleoMTInterpreterOnPackageImportTests.class);
         suite.addTestSuite(AcceleoMTLCompletionTests.class);
         suite.addTestSuite(AcceleoCrossReferencerTest.class);
         suite.addTestSuite(AcceleoPackageRegistryTest.class);
@@ -261,7 +257,33 @@ public class AllCommonPluginTests extends TestCase {
         suite.addTestSuite(TransientSessionTests.class);
         suite.addTestSuite(RestoreSessionFromEditorInputTests.class);
         suite.addTestSuite(SiriusCrossReferenceAdapterTests.class);
-        return suite;
     }
 
+    /**
+     * Add the tests which for one reason or another are not part of the suite
+     * launched on each Gerrit verification.
+     * 
+     * @param suite
+     *            the suite to add the tests into.
+     */
+    public static void addNonGerritPart(TestSuite suite) {
+        // This one takes too long (12 minutes) to be part of the Gerrit suite.
+        suite.addTestSuite(AcceleoMTInterpreterOnPackageImportTests.class);
+        // The ones below are "blacklisted" for now because they caused at least
+        // one false-negative Gerrit Verification job
+        suite.addTestSuite(SessionManagerListener2Tests.class);
+        suite.addTestSuite(RepairWithActivatedFiltersTest.class);
+    }
+
+    /**
+     * Creates the {@link junit.framework.TestSuite TestSuite} for all the test.
+     * 
+     * @return The testsuite containing all the tests
+     */
+    public static Test suite() {
+        final TestSuite suite = new TestSuite("Common Plugin Tests");
+        addGerritPart(suite);
+        addNonGerritPart(suite);
+        return suite;
+    }
 }
diff --git a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/diagram/AllDiagramPluginsTests.java b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/diagram/AllDiagramPluginsTests.java
index cdc890fae4..a1dde8d8bc 100644
--- a/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/diagram/AllDiagramPluginsTests.java
+++ b/plugins/org.eclipse.sirius.tests.junit/src/org/eclipse/sirius/tests/suite/diagram/AllDiagramPluginsTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -240,12 +240,12 @@ public class AllDiagramPluginsTests {
     }
 
     /**
-     * Creates the {@link junit.framework.TestSuite TestSuite} for all the test.
+     * Add the gerrit part of the Junit tests to the specified suite.
      * 
-     * @return The testsuite containing all the tests
+     * @param suite
+     *            the suite into which to add the tests.
      */
-    public static Test suite() {
-        final TestSuite suite = new TestSuite("Diagram Plugins Tests");
+    public static void addGerritPart(TestSuite suite) {
         suite.addTestSuite(InterpolatedColorTest.class);
         suite.addTestSuite(ComputedColorTest.class);
         suite.addTestSuite(LabelColorTest.class);
@@ -384,14 +384,7 @@ public class AllDiagramPluginsTests {
         suite.addTestSuite(LayoutHelperImplEdgeLayoutDataTest.class);
         suite.addTestSuite(LayoutHelperImplNodeLayoutData1Test.class);
         suite.addTestSuite(LayoutHelperImplNodeLayoutData2Test.class);
-        String platformVersion = Platform.getBundle("org.eclipse.core.runtime").getHeaders().get("Bundle-Version");
-        if (!platformVersion.startsWith("3.5")) {
-            suite.addTestSuite(SiriusLayoutDataManagerForSemanticElementsTest.class);
-            if (TestsUtil.shouldRunLongTests()) {
-                suite.addTest(new JUnit4TestAdapter(SiriusLayoutDataManagerForSemanticElementsApplyWithPredefinedDataTest.class));
-            }
-            suite.addTest(new JUnit4TestAdapter(SiriusLayoutDataManagerForSemanticElementsStoreWithPredefinedDataTest.class));
-        }
+
         suite.addTestSuite(SiriusLayoutDataManagerForDDiagramElementWithSameSemanticElementsTest.class);
         suite.addTestSuite(LayoutDataManagerSelectionTest.class);
         suite.addTestSuite(LabelPositionOnContainerAndListTest.class);
@@ -409,7 +402,6 @@ public class AllDiagramPluginsTests {
         suite.addTestSuite(ModelContentTest.class);
         suite.addTestSuite(BorderSizeAndColorTest.class);
         suite.addTestSuite(BorderMarginTest.class);
-        //
         suite.addTestSuite(MappingsReuseTests.class);
         suite.addTestSuite(MappingImportAndFiltersTests.class);
         suite.addTestSuite(OptionalLayersActivationTests.class);
@@ -501,6 +493,40 @@ public class AllDiagramPluginsTests {
         suite.addTestSuite(MMTest.class);
 
         suite.addTest(AllSequenceDiagramsPluginTests.suite());
+
+        String platformVersion = Platform.getBundle("org.eclipse.core.runtime").getHeaders().get("Bundle-Version");
+        if (!platformVersion.startsWith("3.5")) {
+            suite.addTestSuite(SiriusLayoutDataManagerForSemanticElementsTest.class);
+            suite.addTest(new JUnit4TestAdapter(SiriusLayoutDataManagerForSemanticElementsStoreWithPredefinedDataTest.class));
+        }
+
+    }
+
+    /**
+     * Add the tests which for one reason or another are not part of the suite
+     * launched on each Gerrit verification.
+     * 
+     * @param suite
+     *            the suite to add the tests into.
+     */
+    public static void addNonGerritPart(TestSuite suite) {
+        String platformVersion = Platform.getBundle("org.eclipse.core.runtime").getHeaders().get("Bundle-Version");
+        if (!platformVersion.startsWith("3.5") && TestsUtil.shouldRunLongTests()) {
+            // This one is long (~9 minutes), so it is ignored when running
+            suite.addTest(new JUnit4TestAdapter(SiriusLayoutDataManagerForSemanticElementsApplyWithPredefinedDataTest.class));
+        }
+       
+    }
+
+    /**
+     * Creates the {@link junit.framework.TestSuite TestSuite} for all the test.
+     * 
+     * @return The testsuite containing all the tests
+     */
+    public static Test suite() {
+        final TestSuite suite = new TestSuite("Diagram Plugins Tests");
+        addGerritPart(suite);
+        addNonGerritPart(suite);
         return suite;
     }
 }
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ReconnectEdgeBendpointStabilityTest.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ReconnectEdgeBendpointStabilityTest.java
index abb5ed6eef..5ffe15d867 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ReconnectEdgeBendpointStabilityTest.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/ReconnectEdgeBendpointStabilityTest.java
@@ -361,7 +361,8 @@ public class ReconnectEdgeBendpointStabilityTest extends AbstractSiriusSwtBotGef
         } else {
             for (int i = 0; i < pointList.size() - expectedMovedBendpoint; i++) {
                 // Reconnecting from target will move the last bendpoints
-                Assert.assertEquals("Bendpoint " + pointList.getPoint(i) + " expected to be at " + originalPointList.getPoint(i), originalPointList.getPoint(i), pointList.getPoint(i));
+                Assert.assertEquals("Bendpoint " + pointList.getPoint(i) + " expected to be at " + originalPointList.getPoint(i), originalPointList.getPoint(i).x, pointList.getPoint(i).x, 1);
+                Assert.assertEquals("Bendpoint " + pointList.getPoint(i) + " expected to be at " + originalPointList.getPoint(i), originalPointList.getPoint(i).y, pointList.getPoint(i).y, 1);
             }
         }
     }
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java
index 4d6d3d5919..8fbc61c4b1 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2014 THALES GLOBAL SERVICES.
+ * Copyright (c) 2010, 2015 THALES GLOBAL SERVICES.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,11 +10,6 @@
  *******************************************************************************/
 package org.eclipse.sirius.tests.swtbot.suite;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.common.util.WrappedException;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -58,6 +53,11 @@ import org.eclipse.sirius.tests.swtbot.uml.CopyPasteLayoutOfPortsWithConflictWit
 import org.eclipse.sirius.tests.swtbot.uml.PortLocationAfterDragAndDropOnDiagramTest;
 import org.eclipse.sirius.tests.swtbot.uml.PortLocationAfterDragAndDropTest;
 
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
 /**
  * All SWTBot tests.
  * 
@@ -81,16 +81,109 @@ public class AllTestSuite extends TestCase {
      * @return The testsuite containing all the tests
      */
     public static Test suite() {
-        final TestSuite suite = new TestSuite("Sirius SwtBot tests");
-
-        // TheViepointProjectCreationTest shud be done before the others ones :
-        // to verifiy the behavior when a specifier first launches the product.
-        suite.addTestSuite(ViewpointSpecificationProjectCreationTest.class);
+        TestSuite suite = new TestSuite("Sirius SwtBot tests");
+        addPart1(suite);
+        addPart2(suite);
+        return suite;
+    }
 
+    /**
+     * Add the first part of the SWTbot Gerrit tests to the specified suite.
+     * 
+     * @param suite
+     *            the suite into which to add the tests.
+     */
+    public static void addGerritPart1(TestSuite suite) {
         suite.addTestSuite(ContentAssistTest.class);
         suite.addTestSuite(MetamodelPropertyTabTests.class);
-        suite.addTestSuite(CustomizationPropertySectionsTests.class);
         suite.addTestSuite(ResizeKindEditorTest.class);
+        suite.addTestSuite(CascadingSiriusURITest.class);
+        suite.addTestSuite(AssociatedElementsOnPropertyViewTest.class);
+        suite.addTestSuite(NavigationFromDNodeListElementTest.class);
+        suite.addTestSuite(NavigationOnSiriusActivationTest.class);
+        suite.addTestSuite(DiagramDocumentationTest.class);
+        suite.addTestSuite(DiagramPrintTest.class);
+        suite.addTestSuite(DirectEditLabelTest.class);
+        suite.addTestSuite(SetStyleToWorkspaceImageTests.class);
+        suite.addTestSuite(SelectAllAndDeselectionTest.class);
+        suite.addTestSuite(SessionCreationTest.class);
+        suite.addTestSuite(LabelAlignmentRefreshTest.class);
+        suite.addTestSuite(LabelProviderProviderTests.class);
+        suite.addTestSuite(PinnedElementsOnTreeDiagramTest.class);
+        suite.addTestSuite(PinnedElementsTest.class);
+        suite.addTestSuite(PinnedNotesTest.class);
+        suite.addTestSuite(RemoveEdgeBendpointsTest.class);
+        suite.addTestSuite(RemoveNoteTextTest.class);
+        suite.addTestSuite(RequestInterpreterTest.class);
+        suite.addTestSuite(ResetStylePropertiesToDefaultValuesActionTests.class);
+        suite.addTestSuite(MoveBorderNodeTest.class);
+        suite.addTestSuite(LayoutingModeTest.class);
+        suite.addTestSuite(LabelSelectionTest.class);
+        suite.addTestSuite(KeyboardDeleteFromDiagramTests.class);
+        suite.addTestSuite(CustomClipboardSupportTest.class);
+        suite.addTestSuite(KeyboardDeletionFromLabelTests.class);
+        suite.addTestSuite(RefreshWithCustomizedStyleTests.class);
+
+    }
+
+    /**
+     * Add the second part of the SWTbot Gerrit tests to the specified suite.
+     * 
+     * @param suite
+     *            the suite into which to add the tests.
+     */
+    public static void addGerritPart2(TestSuite suite) {
+
+        suite.addTestSuite(NoteCreationTest.class);
+        suite.addTestSuite(MigrationOnVsmEditorReloadTest.class);
+        suite.addTestSuite(VSMFieldTest.class);
+        suite.addTestSuite(VSMAndDiagramEditorSynchronisationTest.class);
+        suite.addTestSuite(SVGImageBundleTest.class);
+        suite.addTestSuite(RoutingStyleTest.class);
+        suite.addTestSuite(RepresentationGroupWithoutRepresentationInstanceTest.class);
+        suite.addTestSuite(RenameProjectWithSessionTest.class);
+        suite.addTestSuite(ReconnectEdgeWithChangedRoutingStyleTest.class);
+        suite.addTestSuite(ReconnectEdgeBendpointStabilityTest.class);
+        suite.addTestSuite(QuickStartScenario.class);
+        suite.addTestSuite(NonVisibleLabelSelectionTest.class);
+        suite.addTestSuite(NavigateToNewRepresentationTest.class);
+        suite.addTestSuite(LockedAppearanceTabTest.class);
+        suite.addTestSuite(GroupElementsInOneOtherTests.class);
+        suite.addTestSuite(GroupElementsInOneOtherTestsWith200PercentOfZoomTests.class);
+        suite.addTestSuite(GroupElementsInOneOtherTestsWith50PercentOfZoomTests.class);
+        suite.addTestSuite(ExtraMappingEdgeCreationTest.class);
+        suite.addTestSuite(ExportDiagramAsImageWhenManyRepresentationsHaveSameNameTest.class);
+        suite.addTestSuite(EdgeCreationTest.class);
+        suite.addTestSuite(DragAndDropFromTableAndTreeToDiagramTest.class);
+        suite.addTestSuite(DeleteSemanticElementToCheckDecorator.class);
+        suite.addTestSuite(DeleteFromDiagramTest.class);
+        suite.addTestSuite(DeleteDiagramWithListeningPaletteToolTest.class);
+        suite.addTestSuite(BoldItalicFontSynchronizationTest.class);
+        suite.addTestSuite(RepresentationRenamingTest.class);
+        suite.addTestSuite(PopupMenuTest.class);
+        suite.addTestSuite(NodeCreationTest.class);
+        suite.addTestSuite(NodeCreationWithSnapToGridTest.class);
+        suite.addTestSuite(GenericClipboardSupportTest.class);
+        suite.addTestSuite(MultiSessionCopyPasteTest.class);
+    }
+
+    /**
+     * Add the first part of the SWTbot tests to the specified suite. This
+     * corresponds roughly to the first half of the execution time of the
+     * complete suite.
+     * 
+     * @param suite
+     *            the suite into which to add the tests.
+     */
+    public static void addPart1(TestSuite suite) {
+
+        addGerritPart1(suite);
+
+        suite.addTestSuite(CustomizationPropertySectionsTests.class);
+        // TheViepointProjectCreationTest should be done before the others ones:
+        // to verify the behavior when a specifier first launches the product.
+        suite.addTestSuite(ViewpointSpecificationProjectCreationTest.class);
+
         // suite.addTest(PseudoClearcaseSwtbotTestSuite.suite());
         suite.addTest(STDSwtbotTestSuite.suite());
         suite.addTest(UMLSwtbotTestSuite.suite());
@@ -114,34 +207,21 @@ public class AllTestSuite extends TestCase {
         suite.addTestSuite(EdgeLabelStabilityTest.class);
         suite.addTestSuite(EdgeStabilityOnLayerManagementTest.class);
         suite.addTestSuite(CenteredEdgesTest.class);
-        suite.addTestSuite(RemoveEdgeBendpointsTest.class);
         suite.addTestSuite(EditorSavingTest.class);
         suite.addTestSuite(EmptyPropertyViewAfterDeletionTest.class);
         suite.addTestSuite(RepresentationVisibilityAfterSessionReloadTest.class);
         suite.addTestSuite(HideRevealDiagramElementsLabelsTest.class);
         suite.addTestSuite(HideRevealDiagramElementsLabelsTestWithOldUI.class);
         suite.addTestSuite(HideLabelIconsWithPreferencesTest.class);
-        suite.addTestSuite(KeyboardDeleteFromDiagramTests.class);
-        suite.addTestSuite(KeyboardDeletionFromLabelTests.class);
         suite.addTestSuite(LabelFontModificationsTest.class);
-        suite.addTestSuite(LabelProviderProviderTests.class);
-        suite.addTestSuite(LabelSelectionTest.class);
         suite.addTestSuite(MultiLineLabelDiagramTest.class);
-        suite.addTestSuite(NavigationFromDNodeListElementTest.class);
-        suite.addTestSuite(NavigationOnSiriusActivationTest.class);
-        suite.addTestSuite(RemoveNoteTextTest.class);
         suite.addTestSuite(NodeCreationPositionTest.class);
         suite.addTestSuite(OpenMultipleRepresentationsTest.class);
-        suite.addTestSuite(PinnedElementsOnTreeDiagramTest.class);
-        suite.addTestSuite(PinnedElementsTest.class);
-        suite.addTestSuite(PinnedNotesTest.class);
-        suite.addTestSuite(LayoutingModeTest.class);
         suite.addTestSuite(ChildrenPositionStabilityAfterParentResizeTest.class);
         suite.addTestSuite(ShapeResizingEdgePositionStabilityTests.class);
         suite.addTestSuite(PortsOnNodePositionStabilityTest.class);
         suite.addTestSuite(PortLocationAfterDragAndDropTest.class);
         suite.addTestSuite(PortLocationAfterDragAndDropOnDiagramTest.class);
-        suite.addTestSuite(MoveBorderNodeTest.class);
         suite.addTestSuite(CopyPasteLayoutOfPortsWithConflictWithNotPastedPortsTest.class);
         suite.addTestSuite(CopyPasteLayoutOfPortsWithConflictWithPastedPortsTest.class);
         suite.addTestSuite(CopyPasteLayoutOfLabelOfBorderedNodeTest.class);
@@ -152,31 +232,30 @@ public class AllTestSuite extends TestCase {
         suite.addTestSuite(PortNotVisibleSelectionTest.class);
         suite.addTestSuite(RefreshAfterUndoDeletionFromGenericToolTest.class);
         suite.addTestSuite(RefreshAfterViewCreationTest.class);
-        suite.addTestSuite(RefreshWithCustomizedStyleTests.class);
         suite.addTestSuite(RefreshWithCustomizedStyleFromAppearanceTabTests.class);
         suite.addTestSuite(RefreshWithCustomizedStyleFromTabbarTests.class);
         suite.addTestSuite(ResizeKindRefreshTests.class);
-        suite.addTestSuite(LabelAlignmentRefreshTest.class);
-        suite.addTestSuite(RequestInterpreterTest.class);
-        suite.addTestSuite(SessionCreationTest.class);
-        suite.addTestSuite(SetStyleToWorkspaceImageTests.class);
-        suite.addTestSuite(ResetStylePropertiesToDefaultValuesActionTests.class);
         suite.addTestSuite(SpecificLayoutBendpointsOnReopeningTest.class);
-        suite.addTestSuite(WorkspaceImageTest.class);
         suite.addTestSuite(TreeFoldingTest.class);
         suite.addTestSuite(DoubleClickToolNavigationOperationTest.class);
-        suite.addTestSuite(CascadingSiriusURITest.class);
         suite.addTestSuite(BackgroundColorFigureUpdateTests.class);
         suite.addTestSuite(EdgeMappingTestCase.class);
-        suite.addTestSuite(DiagramDocumentationTest.class);
-        suite.addTestSuite(DiagramPrintTest.class);
-        suite.addTestSuite(DirectEditLabelTest.class);
-        suite.addTestSuite(SelectAllAndDeselectionTest.class);
-        suite.addTestSuite(NoteCreationTest.class);
+        suite.addTestSuite(ExtensionActivationOrderTest.class);
+    }
+
+    /**
+     * Add the second part of the SWTbot tests to the specified suite. This
+     * corresponds roughly to the second half of the execution time of the
+     * complete suite.
+     * 
+     * @param suite
+     *            the suite into which to add the tests.
+     */
+    public static void addPart2(TestSuite suite) {
+
+        addGerritPart2(suite);
+        suite.addTestSuite(GoToMarkerTraceabilityWithUserInteractionTest.class);
         suite.addTestSuite(NoteCreationWithSnapToGridTest.class);
-        suite.addTestSuite(AssociatedElementsOnPropertyViewTest.class);
-        suite.addTestSuite(NodeCreationTest.class);
-        suite.addTestSuite(NodeCreationWithSnapToGridTest.class);
         suite.addTestSuite(ContainerCreationTest.class);
         suite.addTestSuite(ContainerCreationWithSnapToGridTest.class);
         suite.addTestSuite(DNodeListCreationTest.class);
@@ -194,36 +273,19 @@ public class AllTestSuite extends TestCase {
         suite.addTestSuite(EdgeCreationPositionWithSnapToGridTest.class);
 
         suite.addTestSuite(DeleteHookTests.class);
-        suite.addTestSuite(DeleteFromDiagramTest.class);
-        suite.addTestSuite(DeleteDiagramWithListeningPaletteToolTest.class);
 
         // TODO DLE : reenable theses tests as soon as getEditPart method will
         // be based on matcher.
         // suite.addTestSuite(ToolWizardTest.class);
         suite.addTestSuite(ExportDiagramsAsImagesTest.class);
         suite.addTestSuite(ExportDiagramsAsImagesAndHtmlTest.class);
-        suite.addTestSuite(ExportDiagramAsImageWhenManyRepresentationsHaveSameNameTest.class);
         suite.addTestSuite(TabBarTest.class);
         suite.addTestSuite(NotInvisibleTabBarTest.class);
-        suite.addTestSuite(LockedAppearanceTabTest.class);
         suite.addTestSuite(LockedTabBarTest.class);
         suite.addTestSuite(ArrangeSelectionOnBreakdownDiagramTest.class);
-        suite.addTestSuite(EdgeCreationTest.class);
-        suite.addTestSuite(RoutingStyleTest.class);
-        suite.addTestSuite(PopupMenuTest.class);
-        suite.addTestSuite(RepresentationRenamingTest.class);
-        suite.addTestSuite(NodeLabelPositionTest.class);
-        suite.addTestSuite(NonVisibleLabelSelectionTest.class);
-        suite.addTestSuite(RenameProjectWithSessionTest.class);
-        suite.addTestSuite(VSMAndDiagramEditorSynchronisationTest.class);
-        suite.addTestSuite(VSMFieldTest.class);
         suite.addTestSuite(RemovedDefaultColorMenuTest.class);
-        suite.addTestSuite(NavigateToNewRepresentationTest.class);
         suite.addTestSuite(DuplicationCausedBySelectionTest.class);
         suite.addTestSuite(EdgeWithMultipleLabelsTest.class);
-        suite.addTestSuite(GenericClipboardSupportTest.class);
-        suite.addTestSuite(CustomClipboardSupportTest.class);
-        suite.addTestSuite(MultiSessionCopyPasteTest.class);
         // This test is KO if the cdonative plugins are active (VP-4101), so
         // launch it only when cdonative plugins are not active.
         try {
@@ -235,18 +297,10 @@ public class AllTestSuite extends TestCase {
             // Nothing to do, as viewpoint.cdonative is not accessible the
             // CDONative tests will not be launched
         }
-        suite.addTestSuite(RepresentationGroupWithoutRepresentationInstanceTest.class);
-        suite.addTestSuite(SVGImageBundleTest.class);
         suite.addTestSuite(SetPropertyOfTableTreeByPropertiesViewTest.class);
-        suite.addTestSuite(ToolCreationPositionTest.class);
         suite.addTestSuite(ElementCreationWithPopupMenuTests.class);
         suite.addTestSuite(ElementCreationWithPopupMenuWith200PercentOfZoomTests.class);
         suite.addTestSuite(ElementCreationWithPopupMenuWith50PercentOfZoomTests.class);
-        suite.addTestSuite(GroupElementsInOneOtherTests.class);
-        suite.addTestSuite(GroupElementsInOneOtherTestsWith200PercentOfZoomTests.class);
-        suite.addTestSuite(GroupElementsInOneOtherTestsWith50PercentOfZoomTests.class);
-        suite.addTestSuite(BoldItalicFontSynchronizationTest.class);
-        suite.addTestSuite(ExtensionActivationOrderTest.class);
         suite.addTestSuite(PackageLayoutStabilityOnManyViewsCreationToolTest.class);
         suite.addTestSuite(ResetOriginTest.class);
         suite.addTestSuite(LayoutStabilityOnManualRefreshTest.class);
@@ -258,8 +312,6 @@ public class AllTestSuite extends TestCase {
         suite.addTestSuite(ProjectDependenciesTest.class);
         suite.addTestSuite(ProjectsConcurrentCloseTest.class);
         suite.addTestSuite(ContextualMenuTest.class);
-        suite.addTestSuite(ReconnectEdgeWithChangedRoutingStyleTest.class);
-        suite.addTestSuite(ExtraMappingEdgeCreationTest.class);
         suite.addTestSuite(BracketEdgeTests.class);
         suite.addTestSuite(EdgeCopyPasteLayoutTest.class);
         suite.addTestSuite(BendpointsStabilityOnMovesTest.class);
@@ -267,28 +319,24 @@ public class AllTestSuite extends TestCase {
         suite.addTestSuite(ContainerDefaultSizeLayoutTest.class);
         suite.addTestSuite(ModifyEdgeLayoutAfterRefreshTest.class);
         suite.addTest(TreeSwtbotTestSuite.suite());
-        suite.addTestSuite(DragAndDropFromTableAndTreeToDiagramTest.class);
         suite.addTestSuite(CompletionProposalInVSMTest.class);
-        suite.addTestSuite(MigrationOnVsmEditorReloadTest.class);
         suite.addTestSuite(DirectEditWithInputLabelTest.class);
         suite.addTestSuite(AdditionalLayerTest.class);
         suite.addTestSuite(GroupingContentProviderTest.class);
         suite.addTestSuite(GroupingContentProviderByContainingTest.class);
         suite.addTestSuite(PaletteViewManagementTest.class);
+        suite.addTestSuite(ToolCreationPositionTest.class);
+        suite.addTestSuite(LocalSessionViewTest.class);
 
         // Scenario test cases
         suite.addTestSuite(ESEDemoTest.class);
         suite.addTestSuite(ValidationTest.class);
-        suite.addTestSuite(LocalSessionViewTest.class);
-        suite.addTestSuite(QuickStartScenario.class);
-        suite.addTestSuite(GoToMarkerTraceabilityWithUserInteractionTest.class);
         suite.addTestSuite(InitializeEmptySessionTest.class);
         suite.addTestSuite(InitializeSessionTest.class);
-        suite.addTestSuite(DeleteSemanticElementToCheckDecorator.class);
         suite.addTestSuite(RepairTest.class);
         suite.addTestSuite(ControlUncontrolWithOpenedRepresentationTest.class);
-
-        return suite;
+        suite.addTestSuite(WorkspaceImageTest.class);
+        suite.addTestSuite(NodeLabelPositionTest.class);
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/GerritSWTBotSuite.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/GerritSWTBotSuite.java
new file mode 100644
index 0000000000..a24117a53e
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/GerritSWTBotSuite.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.tests.swtbot.suite;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+/**
+ * Sirius Gerrit SWTBot Tests.
+ * 
+ * @author fbarbin
+ */
+public class GerritSWTBotSuite extends TestCase {
+
+    /**
+     * Launches the test with the given arguments.
+     * 
+     * @param args
+     *            Arguments of the testCase.
+     */
+    public static void main(final String[] args) {
+        TestRunner.run(suite());
+    }
+
+    /**
+     * Creates the {@link junit.framework.TestSuite TestSuite} for all the test.
+     * 
+     * @return The testsuite containing all the tests
+     */
+    public static Test suite() {
+        TestSuite suite = new TestSuite("Sirius Gerrit SWTBot Tests");
+        AllTestSuite.addGerritPart1(suite);
+        AllTestSuite.addGerritPart2(suite);
+        return suite;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/GerritSequenceSWTBotSuite.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/GerritSequenceSWTBotSuite.java
new file mode 100644
index 0000000000..569c3c0918
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/GerritSequenceSWTBotSuite.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.tests.swtbot.suite;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+/**
+ * Sirius Gerrit Sequence SWTBot Tests.
+ * 
+ * @author fbarbin
+ */
+public class GerritSequenceSWTBotSuite extends TestCase {
+
+    /**
+     * Launches the test with the given arguments.
+     * 
+     * @param args
+     *            Arguments of the testCase.
+     */
+    public static void main(final String[] args) {
+        TestRunner.run(suite());
+    }
+
+    /**
+     * Creates the {@link junit.framework.TestSuite TestSuite} for all the test.
+     * 
+     * @return The testsuite containing all the tests
+     */
+    public static Test suite() {
+        TestSuite suite = new TestSuite("Sirius Gerrit Sequence SWTBot Tests");
+        SequenceSwtBotTestSuite.addGerritPart(suite);
+        return suite;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/SWTBotPart1Suite.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/SWTBotPart1Suite.java
new file mode 100644
index 0000000000..41de7d1580
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/SWTBotPart1Suite.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.tests.swtbot.suite;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+/**
+ * First half of the Sirius SWTBot Tests.
+ * 
+ * @author pcdavid
+ */
+public class SWTBotPart1Suite extends TestCase {
+
+    /**
+     * Launches the test with the given arguments.
+     * 
+     * @param args
+     *            Arguments of the testCase.
+     */
+    public static void main(final String[] args) {
+        TestRunner.run(suite());
+    }
+
+    /**
+     * Creates the {@link junit.framework.TestSuite TestSuite} for all the test.
+     * 
+     * @return The testsuite containing all the tests
+     */
+    public static Test suite() {
+        TestSuite suite = new TestSuite("Sirius SWTBot Tests - Part 1/2");
+        AllTestSuite.addPart1(suite);
+        return suite;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/SWTBotPart2Suite.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/SWTBotPart2Suite.java
new file mode 100644
index 0000000000..15fe77c10d
--- /dev/null
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/SWTBotPart2Suite.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.sirius.tests.swtbot.suite;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+/**
+ * Second half of the Sirius SWTBot Tests.
+ * 
+ * @author pcdavid
+ */
+public class SWTBotPart2Suite extends TestCase {
+
+    /**
+     * Launches the test with the given arguments.
+     * 
+     * @param args
+     *            Arguments of the testCase.
+     */
+    public static void main(final String[] args) {
+        TestRunner.run(suite());
+    }
+
+    /**
+     * Creates the {@link junit.framework.TestSuite TestSuite} for all the test.
+     * 
+     * @return The testsuite containing all the tests
+     */
+    public static Test suite() {
+        TestSuite suite = new TestSuite("Sirius SWTBot Tests - Part 2/2");
+        AllTestSuite.addPart2(suite);
+        return suite;
+    }
+}
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/SequenceSwtBotTestSuite.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/SequenceSwtBotTestSuite.java
index a601cb4a32..aaf7a347ad 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/SequenceSwtBotTestSuite.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/SequenceSwtBotTestSuite.java
@@ -100,12 +100,12 @@ public class SequenceSwtBotTestSuite extends TestCase {
     }
 
     /**
-     * Creates the {@link junit.framework.TestSuite TestSuite} for all the test.
+     * Add the gerrit part of the Sequence tests to the specified suite.
      * 
-     * @return The test suite containing all the tests
+     * @param suite
+     *            the suite into which to add the tests.
      */
-    public static Test suite() {
-        final TestSuite suite = new TestSuite("SwtBot tests on sequence diagram");
+    public static void addGerritPart(TestSuite suite) {
         suite.addTestSuite(InstanceRoleResizableEditPolicyTests.class);
         suite.addTestSuite(SequenceReorderTest.class);
         suite.addTestSuite(SequenceDiagramDirtyTests.class);
@@ -114,12 +114,10 @@ public class SequenceSwtBotTestSuite extends TestCase {
         suite.addTestSuite(FrameMoveWithExpansionTest.class);
         suite.addTestSuite(SequenceLifelineTest.class);
         suite.addTestSuite(SequenceBasicMessageTest.class);
-        suite.addTestSuite(SequenceReturnMessageTest.class);
         suite.addTestSuite(MessageExtensionTest.class);
         suite.addTestSuite(SequenceExecutionBasicAndReturnMessageTest.class);
         suite.addTestSuite(SequenceMessageToSelfTest.class);
         suite.addTestSuite(CreateMessageTests.class);
-        suite.addTestSuite(SequenceDestroyMessageTest.class);
         suite.addTestSuite(ExecutionTests.class);
         suite.addTestSuite(ExecutionMoveTests.class);
         suite.addTestSuite(ExecutionMove2Tests.class);
@@ -131,6 +129,18 @@ public class SequenceSwtBotTestSuite extends TestCase {
         suite.addTestSuite(ExecutionMessageReconnectionTests.class);
         suite.addTestSuite(ExecutionLinkedMessageReconnectionTests.class);
         suite.addTestSuite(ExternalModificationsTests.class);
+    }
+
+    /**
+     * Creates the {@link junit.framework.TestSuite TestSuite} for all the test.
+     * 
+     * @return The test suite containing all the tests
+     */
+    public static Test suite() {
+        final TestSuite suite = new TestSuite("SwtBot tests on sequence diagram");
+
+        addGerritPart(suite);
+        suite.addTestSuite(SequenceReturnMessageTest.class);
         suite.addTestSuite(SyncCallTest.class);
         suite.addTestSuite(SyncCallMoveTest.class);
         suite.addTestSuite(SyncCall2Test.class);
@@ -138,6 +148,7 @@ public class SequenceSwtBotTestSuite extends TestCase {
         suite.addTestSuite(SyncCallInOperandReorderTest.class);
         suite.addTestSuite(CreateMessageOnCollapsedExecutionTest.class);
         suite.addTestSuite(SequenceExecutionMessageToSelfTest.class);
+        suite.addTestSuite(SequenceDestroyMessageTest.class);
         suite.addTestSuite(NoteAttachmentTest.class);
         suite.addTestSuite(SequenceArrangeLinkedBorderedNodesTest.class);
         suite.addTestSuite(InteractionUseSingleClickCreationTests.class);