[495810] Move more unreliable tests into SWTBot-Part2 suite

Bug: 495810
Change-Id: I86e740051fe33df9d2cc4544e913a506ad0ab4ff
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

3 files changed, 62 insertions, 23 deletions

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 fdc30d9ca2..3d83a82f01 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
@@ -130,7 +130,6 @@ public class AllTestSuite extends TestCase {
         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);
@@ -149,7 +148,6 @@ public class AllTestSuite extends TestCase {
         suite.addTestSuite(ShowTypeActionButtonTest.class);
         suite.addTestSuite(SpecificClosedOrNotClosedEditorTest.class);
         suite.addTestSuite(LineStyleTest.class);
-        suite.addTestSuite(CompartmentsCreationTest.class);
     }
 
     /**
@@ -204,6 +202,8 @@ public class AllTestSuite extends TestCase {
         suite.addTestSuite(CenteredEdgesRepairTest.class);
         suite.addTestSuite(MetamodelPropertyTabTests.class);
         suite.addTestSuite(DiagramPrintTest.class);
+        suite.addTestSuite(CompartmentsCreationTest.class);
+        suite.addTestSuite(PinnedElementsTest.class);
     }
 
     /**
@@ -218,14 +218,10 @@ public class AllTestSuite extends TestCase {
 
         addGerritPart1(suite);
 
-        // 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());
+        STDSwtbotTestSuite.addPart1(suite);
         suite.addTest(UMLSwtbotTestSuite.suite());
-        suite.addTest(TableSwtbotTestSuite.suite());
+        TableSwtbotTestSuite.addPart1(suite);
 
         suite.addTestSuite(CrossTableIntersectionTest.class);
         suite.addTestSuite(CrossTableIntersectionExpressionTest.class);
@@ -247,10 +243,8 @@ public class AllTestSuite extends TestCase {
         suite.addTestSuite(EdgeLabelsMoveTest.class);
         suite.addTestSuite(EdgeStabilityOnLayerManagementTest.class);
         suite.addTestSuite(EdgeOnFigureWithAlphaAnchorTest.class);
-        suite.addTestSuite(CenteredEdgesTest.class);
         suite.addTestSuite(EditorSavingTest.class);
         suite.addTestSuite(EmptyPropertyViewAfterDeletionTest.class);
-        suite.addTestSuite(LinkWithEditorFeatureWithModelExplorerViewTest.class);
         suite.addTestSuite(RepresentationVisibilityAfterSessionReloadTest.class);
         suite.addTestSuite(HideRevealDiagramElementsLabelsTestWithOldUI.class);
         suite.addTestSuite(HideLabelIconsWithPreferencesTest.class);
@@ -271,16 +265,13 @@ public class AllTestSuite extends TestCase {
         suite.addTestSuite(PortSelectionTest.class);
         suite.addTestSuite(PortNotVisibleSelectionTest.class);
         suite.addTestSuite(RefreshAfterUndoDeletionFromGenericToolTest.class);
-        suite.addTest(new JUnit4TestAdapter(RefreshAfterViewCreationTest.class));
         suite.addTestSuite(RefreshWithCustomizedStyleFromAppearanceTabTests.class);
         suite.addTestSuite(RefreshWithCustomizedStyleFromTabbarTests.class);
         suite.addTestSuite(ResizeKindRefreshTests.class);
-        suite.addTestSuite(SpecificLayoutBendpointsOnReopeningTest.class);
         suite.addTestSuite(TreeFoldingTest.class);
         suite.addTestSuite(DoubleClickToolNavigationOperationTest.class);
         suite.addTestSuite(BackgroundColorFigureUpdateTests.class);
         suite.addTestSuite(BackgroundStyleUpdateTest.class);
-        suite.addTestSuite(BorderSizeComputationExpressionTest.class);
         suite.addTestSuite(EdgeMappingTestCase.class);
         suite.addTestSuite(InvalidMetamodelRessourceTest.class);
         suite.addTestSuite(ExtensionActivationOrderTest.class);
@@ -295,8 +286,14 @@ public class AllTestSuite extends TestCase {
      *            the suite into which to add the tests.
      */
     public static void addPart2(TestSuite suite) {
-
+        // The ViewpointProjectCreationTest should be done before the others ones:
+        // to verify the behavior when a specifier first launches the product.
+        suite.addTestSuite(ViewpointSpecificationProjectCreationTest.class);
+        
         addGerritPart2(suite);
+        STDSwtbotTestSuite.addPart2(suite);
+        TableSwtbotTestSuite.addPart2(suite);
+        
         suite.addTestSuite(CustomizationPropertySectionsTests.class);
         suite.addTestSuite(GoToMarkerTraceabilityWithUserInteractionTest.class);
         suite.addTestSuite(NoteCreationWithSnapToGridTest.class);
@@ -318,6 +315,11 @@ public class AllTestSuite extends TestCase {
         suite.addTestSuite(EdgeCreationPositionWithSnapToGridTest.class);
         suite.addTestSuite(EdgeWithBorderNodeCreationPositionWithSnapToGridTest.class);
         suite.addTestSuite(HideRevealDiagramElementsLabelsTest.class);
+        suite.addTestSuite(LinkWithEditorFeatureWithModelExplorerViewTest.class);
+        suite.addTest(new JUnit4TestAdapter(RefreshAfterViewCreationTest.class));
+        suite.addTestSuite(SpecificLayoutBendpointsOnReopeningTest.class);
+        suite.addTestSuite(BorderSizeComputationExpressionTest.class);
+        suite.addTestSuite(CenteredEdgesTest.class);
 
         suite.addTestSuite(DeleteHookTests.class);
 
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/STDSwtbotTestSuite.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/STDSwtbotTestSuite.java
index 1d0ba919e3..deed87ad76 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/STDSwtbotTestSuite.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/STDSwtbotTestSuite.java
@@ -60,16 +60,24 @@ public class STDSwtbotTestSuite extends TestCase {
      */
     public static Test suite() {
         final TestSuite suite = new TestSuite("STD SWTBOT test suite");
-
+        addPart1(suite);
+        addPart2(suite);
+        return suite;
+    }
+    
+    /**
+     * Add the first part of the SWTbot tests to the specified suite.
+     * 
+     * @param suite
+     *            the suite into which to add the tests.
+     */    
+    public static void addPart1(TestSuite suite) {
         suite.addTestSuite(STD001.class);
         suite.addTestSuite(STD002.class);
         suite.addTestSuite(STD004.class);
         suite.addTestSuite(STD005.class);
-        suite.addTestSuite(STD006.class);
         suite.addTestSuite(STD007.class);
-        suite.addTestSuite(STD008.class);
         suite.addTestSuite(STD009.class);
-        suite.addTestSuite(STD010.class);
         suite.addTestSuite(STD011.class);
         // suite.addTestSuite(STD013.class);
         // suite.addTestSuite(STD017.class);
@@ -84,7 +92,18 @@ public class STDSwtbotTestSuite extends TestCase {
         // suite.addTestSuite(STD047.class);/// broken?=>pe pb du UILocalSession
         // suite.addTestSuite(STD048.class);
         // suite.addTestSuite(STD049.class);
-        return suite;
+    }
+    
+    /**
+     * Add the second part of the SWTbot tests to the specified suite.
+     * 
+     * @param suite
+     *            the suite into which to add the tests.
+     */    
+    public static void addPart2(TestSuite suite) {
+        suite.addTestSuite(STD006.class);
+        suite.addTestSuite(STD008.class);
+        suite.addTestSuite(STD010.class);
     }
 
     /**
diff --git a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/TableSwtbotTestSuite.java b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/TableSwtbotTestSuite.java
index b242bba76b..0565e9e951 100644
--- a/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/TableSwtbotTestSuite.java
+++ b/plugins/org.eclipse.sirius.tests.swtbot/src/org/eclipse/sirius/tests/swtbot/suite/TableSwtbotTestSuite.java
@@ -46,7 +46,7 @@ public class TableSwtbotTestSuite extends TestCase {
     public static void main(final String[] args) {
         TestRunner.run(suite());
     }
-
+    
     /**
      * Creates the {@link junit.framework.TestSuite TestSuite} for all the test.
      * 
@@ -54,6 +54,17 @@ public class TableSwtbotTestSuite extends TestCase {
      */
     public static Test suite() {
         final TestSuite suite = new TestSuite("Table SWTBOT test suite");
+        addPart1(suite);
+        addPart2(suite);
+        return suite;
+    }
+    /**
+     * Add the first part of the SWTbot tests to the specified suite.
+     * 
+     * @param suite
+     *            the suite into which to add the tests.
+     */
+    public static void addPart1(TestSuite suite) {
         suite.addTestSuite(HideRevealTableColumnsTest.class);
         suite.addTestSuite(HideRevealTableLinesTest.class);
         suite.addTestSuite(RenameTableRepresentationTest.class);
@@ -65,13 +76,20 @@ public class TableSwtbotTestSuite extends TestCase {
         }
         suite.addTestSuite(ContextMenuTableTest.class);
         suite.addTestSuite(TableUIPermissionAuthorityTests.class);
-        suite.addTestSuite(TableUIRefreshTests.class);
         suite.addTestSuite(DeleteLineWithDELShortcutTest.class);
         suite.addTestSuite(TableRefreshWithF5ShortcutTests.class);
-        suite.addTestSuite(NavigationDescriptionFromTableAndTreeTest.class);
         suite.addTestSuite(CellEditionTest.class);
         suite.addTestSuite(ReadOnlyColumnTest.class);
-        return suite;
+    }
+    /**
+     * Add the second part of the SWTbot tests to the specified suite.
+     * 
+     * @param suite
+     *            the suite into which to add the tests.
+     */
+    public static void addPart2(TestSuite suite) {
+        suite.addTestSuite(NavigationDescriptionFromTableAndTreeTest.class);
+        suite.addTestSuite(TableUIRefreshTests.class);
     }
 
     /**