swtbot: Add Testing perspective for SWTBot tests

The Testing perspective gives more space for the new views opened by a
test so that the screenshots of failed tests are more useful.

SWTBotUtils.initialize() will now close the Welcome view and switch to
this perspective.

Change-Id: Ib0de0baf74fd008fafc8f3c21cf23803e4c94bee
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/132151
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: CI Bot

43 files changed, 72 insertions, 170 deletions

diff --git a/analysis/org.eclipse.tracecompass.analysis.lami.ui.swtbot.tests/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/ui/views/LamiChartViewerTest.java b/analysis/org.eclipse.tracecompass.analysis.lami.ui.swtbot.tests/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/ui/views/LamiChartViewerTest.java
index 59a2ff0a06..86009cb0f2 100644
--- a/analysis/org.eclipse.tracecompass.analysis.lami.ui.swtbot.tests/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/ui/views/LamiChartViewerTest.java
+++ b/analysis/org.eclipse.tracecompass.analysis.lami.ui.swtbot.tests/src/org/eclipse/tracecompass/internal/provisional/analysis/lami/ui/views/LamiChartViewerTest.java
@@ -103,10 +103,6 @@ public class LamiChartViewerTest {
         SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
         fLogger.removeAllAppenders();
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
-        SWTWorkbenchBot bot = new SWTWorkbenchBot();
-        SWTBotUtils.closeView("welcome", bot);
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
 
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyDensityViewTest.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyDensityViewTest.java
index c4b4960fd6..59ace958be 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyDensityViewTest.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyDensityViewTest.java
@@ -86,9 +86,6 @@ public class SystemCallLatencyDensityViewTest {
         fLogger.removeAllAppenders();
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
         fBot = new SWTWorkbenchBot();
-        SWTBotUtils.closeView("welcome", fBot);
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
 
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyStatisticsTableAnalysisTest.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyStatisticsTableAnalysisTest.java
index 3a649970ef..3dcbe4c166 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyStatisticsTableAnalysisTest.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyStatisticsTableAnalysisTest.java
@@ -87,9 +87,6 @@ public class SystemCallLatencyStatisticsTableAnalysisTest {
         fLogger.removeAllAppenders();
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
         fBot = new SWTWorkbenchBot();
-        SWTBotUtils.closeView("welcome", fBot);
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
 
diff --git a/analysis/org.eclipse.tracecompass.analysis.profiling.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/profiling/ui/swtbot/tests/callgraph/CallGraphDensityViewTest.java b/analysis/org.eclipse.tracecompass.analysis.profiling.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/profiling/ui/swtbot/tests/callgraph/CallGraphDensityViewTest.java
index ee86780ecd..9193511fe9 100644
--- a/analysis/org.eclipse.tracecompass.analysis.profiling.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/profiling/ui/swtbot/tests/callgraph/CallGraphDensityViewTest.java
+++ b/analysis/org.eclipse.tracecompass.analysis.profiling.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/profiling/ui/swtbot/tests/callgraph/CallGraphDensityViewTest.java
@@ -92,10 +92,6 @@ public class CallGraphDensityViewTest extends AggregationTreeTest {
         SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
         fLogger.removeAllAppenders();
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
-        SWTWorkbenchBot bot = new SWTWorkbenchBot();
-        SWTBotUtils.closeView("welcome", bot);
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
     }
diff --git a/analysis/org.eclipse.tracecompass.analysis.profiling.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/profiling/ui/swtbot/tests/flamegraph/FlameGraphTest.java b/analysis/org.eclipse.tracecompass.analysis.profiling.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/profiling/ui/swtbot/tests/flamegraph/FlameGraphTest.java
index d8ec8e3a36..157cbfcfd8 100644
--- a/analysis/org.eclipse.tracecompass.analysis.profiling.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/profiling/ui/swtbot/tests/flamegraph/FlameGraphTest.java
+++ b/analysis/org.eclipse.tracecompass.analysis.profiling.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/profiling/ui/swtbot/tests/flamegraph/FlameGraphTest.java
@@ -82,10 +82,6 @@ public class FlameGraphTest extends AggregationTreeTest {
         SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
         fLogger.removeAllAppenders();
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
-        SWTWorkbenchBot bot = new SWTWorkbenchBot();
-        SWTBotUtils.closeView("welcome", bot);
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
     }
diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/timing/ui/swtbot/tests/table/SegmentTableTest.java b/analysis/org.eclipse.tracecompass.analysis.timing.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/timing/ui/swtbot/tests/table/SegmentTableTest.java
index 1bf2129422..3de8794a0d 100644
--- a/analysis/org.eclipse.tracecompass.analysis.timing.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/timing/ui/swtbot/tests/table/SegmentTableTest.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/timing/ui/swtbot/tests/table/SegmentTableTest.java
@@ -177,9 +177,6 @@ public class SegmentTableTest {
         fLogger.removeAllAppenders();
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
         fBot = new SWTWorkbenchBot();
-        SWTBotUtils.closeView("welcome", fBot);
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
     }
diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/AbstractImportAndReadSmokeTest.java b/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/AbstractImportAndReadSmokeTest.java
index 8eb1463479..0c79ee4cc0 100644
--- a/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/AbstractImportAndReadSmokeTest.java
+++ b/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/AbstractImportAndReadSmokeTest.java
@@ -93,8 +93,6 @@ public abstract class AbstractImportAndReadSmokeTest {
         fLogger.addAppender(new NullAppender());
         fBot = new SWTWorkbenchBot();
 
-        SWTBotUtils.closeView("welcome", fBot);
-
         SWTBotUtils.switchToTracingPerspective();
         /* finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/TestInvalidCtfTrace.java b/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/TestInvalidCtfTrace.java
index 5010f550e1..8a61f7ad34 100644
--- a/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/TestInvalidCtfTrace.java
+++ b/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/TestInvalidCtfTrace.java
@@ -176,9 +176,6 @@ public class TestInvalidCtfTrace {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout()));
         fBot = new SWTWorkbenchBot();
 
-        SWTBotUtils.closeView("welcome", fBot);
-
-        SWTBotUtils.switchToTracingPerspective();
         /* finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
         SWTBotUtils.createProject(PROJET_NAME);
diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/trim/CtfTmfExperimentTrimmingTest.java b/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/trim/CtfTmfExperimentTrimmingTest.java
index 2b7d1a82ba..52075559ec 100644
--- a/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/trim/CtfTmfExperimentTrimmingTest.java
+++ b/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/trim/CtfTmfExperimentTrimmingTest.java
@@ -99,9 +99,6 @@ public class CtfTmfExperimentTrimmingTest {
         fLogger.removeAllAppenders();
         fLogger.addAppender(new NullAppender());
 
-        SWTBotUtils.closeView("welcome", new SWTWorkbenchBot());
-
-        SWTBotUtils.switchToTracingPerspective();
         /* finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
     }
diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/FlameChartViewTest.java b/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/FlameChartViewTest.java
index ce233509fe..766484cc1b 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/FlameChartViewTest.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/FlameChartViewTest.java
@@ -177,9 +177,6 @@ public class FlameChartViewTest {
         sfLogger.addAppender(new ConsoleAppender(new SimpleLayout()));
         sfBot = new SWTWorkbenchBot();
 
-        SWTBotUtils.closeView("welcome", sfBot);
-
-        SWTBotUtils.switchToTracingPerspective();
         SWTBotUtils.closeView("Statistics", sfBot);
         /* finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
diff --git a/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/markers/MarkerSetSwtBotTest.java b/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/markers/MarkerSetSwtBotTest.java
index f6d1a4926e..812110921d 100644
--- a/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/markers/MarkerSetSwtBotTest.java
+++ b/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/markers/MarkerSetSwtBotTest.java
@@ -84,10 +84,7 @@ public class MarkerSetSwtBotTest {
         SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
         fBot = new SWTWorkbenchBot();
 
-        SWTBotUtils.closeView("Welcome", fBot);
-
         SWTBotUtils.createProject(TRACE_PROJECT_NAME);
-        SWTBotUtils.switchToTracingPerspective();
         WaitUtils.waitForJobs();
 
         final CtfTestTrace cygProfile = CtfTestTrace.CYG_PROFILE;
diff --git a/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerRefreshTest.java b/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerRefreshTest.java
index 4549e04db0..a3b3230bec 100644
--- a/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerRefreshTest.java
+++ b/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerRefreshTest.java
@@ -91,12 +91,6 @@ public class ProjectExplorerRefreshTest {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
         fBot = new SWTWorkbenchBot();
 
-        /* Close welcome view */
-        SWTBotUtils.closeView("Welcome", fBot);
-
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
-
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
 
diff --git a/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTraceActionsTest.java b/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTraceActionsTest.java
index e0988e11e2..90efdd2906 100644
--- a/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTraceActionsTest.java
+++ b/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTraceActionsTest.java
@@ -135,12 +135,6 @@ public class ProjectExplorerTraceActionsTest {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
         fBot = new SWTWorkbenchBot();
 
-        /* Close welcome view */
-        SWTBotUtils.closeView("Welcome", fBot);
-
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
-
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
         SWTBotUtils.createProject(TRACE_PROJECT_NAME);
diff --git a/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTracesFolderTest.java b/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTracesFolderTest.java
index 2cc38c95f6..63f90a63cb 100644
--- a/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTracesFolderTest.java
+++ b/releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTracesFolderTest.java
@@ -178,10 +178,6 @@ public class ProjectExplorerTracesFolderTest {
         fLogger.addAppender(new NullAppender());
         fBot = new SWTWorkbenchBot();
 
-        SWTBotUtils.closeView("Welcome", fBot);
-
-        SWTBotUtils.switchToTracingPerspective();
-
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
         SWTBotUtils.createProject(TRACE_PROJECT_NAME);
diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternLatencyViewTestBase.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternLatencyViewTestBase.java
index 6f2cf28582..bf54207ba4 100644
--- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternLatencyViewTestBase.java
+++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternLatencyViewTestBase.java
@@ -65,10 +65,6 @@ public abstract class PatternLatencyViewTestBase {
         SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
         fLogger.removeAllAppenders();
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
-        SWTWorkbenchBot bot = new SWTWorkbenchBot();
-        SWTBotUtils.closeView("welcome", bot);
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
 
diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/preferences/XMLAnalysesManagerPreferencePageTest.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/preferences/XMLAnalysesManagerPreferencePageTest.java
index bb45efb9f1..f2f4d7cdf6 100644
--- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/preferences/XMLAnalysesManagerPreferencePageTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/preferences/XMLAnalysesManagerPreferencePageTest.java
@@ -108,9 +108,6 @@ public class XMLAnalysesManagerPreferencePageTest {
         fLogger.removeAllAppenders();
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
         fBot = new SWTWorkbenchBot();
-        SWTBotUtils.closeView("welcome", fBot);
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
     }
 
     /**
diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/timegraph/XmlTimegraphViewTest.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/timegraph/XmlTimegraphViewTest.java
index 84a2fb4c9d..b6c325110d 100644
--- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/timegraph/XmlTimegraphViewTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/timegraph/XmlTimegraphViewTest.java
@@ -57,10 +57,6 @@ public class XmlTimegraphViewTest {
         Thread.currentThread().setName("SWTBotTest");
         /* set up for swtbot */
         SWTBotPreferences.TIMEOUT = 10000; /* 10 second timeout */
-        SWTWorkbenchBot bot = new SWTWorkbenchBot();
-        SWTBotUtils.closeView("welcome", bot);
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
 
diff --git a/tmf/org.eclipse.tracecompass.tmf.chart.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/chart/ui/swtbot/tests/dialog/ChartMakerDialogTest.java b/tmf/org.eclipse.tracecompass.tmf.chart.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/chart/ui/swtbot/tests/dialog/ChartMakerDialogTest.java
index c8a531e4b7..d2b4102920 100644
--- a/tmf/org.eclipse.tracecompass.tmf.chart.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/chart/ui/swtbot/tests/dialog/ChartMakerDialogTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.chart.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/chart/ui/swtbot/tests/dialog/ChartMakerDialogTest.java
@@ -86,10 +86,6 @@ public class ChartMakerDialogTest {
         SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
         fLogger.removeAllAppenders();
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
-        SWTWorkbenchBot bot = new SWTWorkbenchBot();
-        SWTBotUtils.closeView("welcome", bot);
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
         SWTBotUtils.openView(CustomChartStubView.ID);
diff --git a/tmf/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/remote/ui/swtbot/tests/fetch/FetchRemoteTracesTest.java b/tmf/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/remote/ui/swtbot/tests/fetch/FetchRemoteTracesTest.java
index 9743bb308e..728c9b1408 100644
--- a/tmf/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/remote/ui/swtbot/tests/fetch/FetchRemoteTracesTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/remote/ui/swtbot/tests/fetch/FetchRemoteTracesTest.java
@@ -88,7 +88,6 @@ public class FetchRemoteTracesTest {
     private static final String TRACE_LOCATION;
     private static final String TRACE_TYPE_KERNEL = "org.eclipse.linuxtools.lttng2.kernel.tracetype";
     private static final String TRACE_TYPE_SYSLOG = "org.eclipse.linuxtools.tmf.tests.stubs.trace.text.testsyslog";
-    private static final String WELCOME_NAME = "welcome";
 
     private static SWTWorkbenchBot fBot;
 
@@ -135,9 +134,6 @@ public class FetchRemoteTracesTest {
         fLogger.addAppender(new NullAppender());
         fBot = new SWTWorkbenchBot();
 
-        SWTBotUtils.closeView(WELCOME_NAME, fBot);
-
-        SWTBotUtils.switchToTracingPerspective();
         /* finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
 
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/plugin.xml b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/plugin.xml
index eb287d02da..e80cba9c2d 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/plugin.xml
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/plugin.xml
@@ -4,6 +4,11 @@
    <extension
          point="org.eclipse.ui.perspectives">
       <perspective
+            class="org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.TestingPerspectiveFactory"
+            id="org.eclipse.tracecompass.tmf.ui.swtbot.tests.perspective"
+            name="Testing">
+      </perspective>
+      <perspective
             class="org.eclipse.tracecompass.tmf.ui.swtbot.tests.viewers.events.TmfAlignTimeAxisTest$AlignPerspectiveFactory2"
             id="org.eclipse.linuxtools.tmf.test.align.2"
             name="Align2">
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/SWTBotUtils.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/SWTBotUtils.java
index 659a9657e4..286968905e 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/SWTBotUtils.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/SWTBotUtils.java
@@ -439,8 +439,11 @@ public final class SWTBotUtils {
         /* Do not display the warning when many entries are selected in the tree viewer. */
         store.setValue(ITmfUIPreferences.HIDE_MANY_ENTRIES_SELECTED_TOGGLE, true);
 
-        // Switch to and reset Tracing perspective
-        switchToTracingPerspective();
+        // Close Welcome view
+        SWTBotUtils.closeView("welcome", new SWTWorkbenchBot());
+
+        // Switch to and reset Testing perspective
+        switchToPerspective(TestingPerspectiveFactory.ID);
     }
 
     private static void printEnvironment() {
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/TestingPerspectiveFactory.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/TestingPerspectiveFactory.java
new file mode 100644
index 0000000000..e96f840054
--- /dev/null
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/TestingPerspectiveFactory.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Ericsson
+ *
+ * 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:
+ *   Patrick Tasse - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared;
+
+import org.eclipse.tracecompass.tmf.ui.project.wizards.NewTmfProjectWizard;
+import org.eclipse.ui.IFolderLayout;
+import org.eclipse.ui.IPageLayout;
+import org.eclipse.ui.IPerspectiveFactory;
+
+/**
+ * The Testing perspective definition.
+ */
+public class TestingPerspectiveFactory implements IPerspectiveFactory {
+
+    // ------------------------------------------------------------------------
+    // Constants
+    // ------------------------------------------------------------------------
+
+    /** The Perspective ID */
+    public static final String ID = "org.eclipse.tracecompass.tmf.ui.swtbot.tests.perspective"; //$NON-NLS-1$
+
+    // ------------------------------------------------------------------------
+    // IPerspectiveFactory
+    // ------------------------------------------------------------------------
+
+    @Override
+    public void createInitialLayout(IPageLayout layout) {
+
+        // Editor area
+        layout.setEditorAreaVisible(true);
+
+        // Create the left folder
+        IFolderLayout leftFolder = layout.createFolder(
+                "leftFolder", IPageLayout.LEFT, 0.25f, IPageLayout.ID_EDITOR_AREA); //$NON-NLS-1$
+        leftFolder.addView(IPageLayout.ID_PROJECT_EXPLORER);
+
+        // Create the bottom right folder
+        IFolderLayout bottomRightFolder = layout.createFolder(
+                "bottomRightFolder", IPageLayout.BOTTOM, 0.5f, IPageLayout.ID_EDITOR_AREA); //$NON-NLS-1$
+        bottomRightFolder.addView(IPageLayout.ID_PROP_SHEET);
+
+        // Populate menus, etc
+        layout.addPerspectiveShortcut(ID);
+        layout.addNewWizardShortcut(NewTmfProjectWizard.ID);
+    }
+
+}
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/parsers/custom/AbstractCustomParserWizard.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/parsers/custom/AbstractCustomParserWizard.java
index f8755f1b6f..a7dff17f99 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/parsers/custom/AbstractCustomParserWizard.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/parsers/custom/AbstractCustomParserWizard.java
@@ -54,9 +54,6 @@ public class AbstractCustomParserWizard {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout()));
         fBot = new SWTWorkbenchBot();
 
-        SWTBotUtils.closeView("welcome", fBot);
-
-        SWTBotUtils.switchToTracingPerspective();
         /* finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
     }
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/project/AddProjectNatureTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/project/AddProjectNatureTest.java
index 75f042410a..818179f8d9 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/project/AddProjectNatureTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/project/AddProjectNatureTest.java
@@ -121,12 +121,6 @@ public class AddProjectNatureTest {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
         fBot = new SWTWorkbenchBot();
 
-        /* Close welcome view */
-        SWTBotUtils.closeView("Welcome", fBot);
-
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
-
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
 
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/tracetype/preferences/TraceTypePreferencePageTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/tracetype/preferences/TraceTypePreferencePageTest.java
index 3ea3d22a48..7aba1981f7 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/tracetype/preferences/TraceTypePreferencePageTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/tracetype/preferences/TraceTypePreferencePageTest.java
@@ -101,9 +101,6 @@ public class TraceTypePreferencePageTest {
         fLogger.removeAllAppenders();
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
         fBot = new SWTWorkbenchBot();
-        SWTBotUtils.closeView("welcome", fBot);
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
         /* Create the trace project */
         SWTBotUtils.createProject(TRACE_PROJECT_NAME);
         /* Finish waiting for eclipse to load */
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/CallsiteEventsInTableTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/CallsiteEventsInTableTest.java
index 34c57f4edb..3e7169b4ff 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/CallsiteEventsInTableTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/CallsiteEventsInTableTest.java
@@ -118,12 +118,6 @@ public class CallsiteEventsInTableTest {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
         fBot = new SWTWorkbenchBot();
 
-        /* Close welcome view */
-        SWTBotUtils.closeView("Welcome", fBot);
-
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
-
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
     }
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/CollapseEventsInTableTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/CollapseEventsInTableTest.java
index c3ecc41a03..40d437fde7 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/CollapseEventsInTableTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/CollapseEventsInTableTest.java
@@ -98,12 +98,6 @@ public class CollapseEventsInTableTest {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
         fBot = new SWTWorkbenchBot();
 
-        /* Close welcome view */
-        SWTBotUtils.closeView("Welcome", fBot);
-
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
-
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
     }
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/ColorsViewTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/ColorsViewTest.java
index 019fd3d3fe..ec8d2df6b0 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/ColorsViewTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/ColorsViewTest.java
@@ -173,9 +173,6 @@ public class ColorsViewTest {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout()));
         fBot = new SWTWorkbenchBot();
 
-        SWTBotUtils.closeView("welcome", fBot);
-
-        SWTBotUtils.switchToTracingPerspective();
         /* finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
         fFileLocation = File.createTempFile("sample", ".xml");
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/ColumnHeaderMenuTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/ColumnHeaderMenuTest.java
index a0e19884ac..1dc7234b2a 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/ColumnHeaderMenuTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/ColumnHeaderMenuTest.java
@@ -93,12 +93,6 @@ public class ColumnHeaderMenuTest {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
         fBot = new SWTWorkbenchBot();
 
-        /* Close welcome view */
-        SWTBotUtils.closeView("Welcome", fBot);
-
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
-
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
 
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/CopyToClipboardTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/CopyToClipboardTest.java
index 0c1299c4a4..a1225b7ebc 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/CopyToClipboardTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/CopyToClipboardTest.java
@@ -102,12 +102,6 @@ public class CopyToClipboardTest {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
         fBot = new SWTWorkbenchBot();
 
-        /* Close welcome view */
-        SWTBotUtils.closeView("Welcome", fBot);
-
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
-
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
 
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/ExportToTsvTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/ExportToTsvTest.java
index 38bb0b2b4f..0a501463e7 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/ExportToTsvTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/ExportToTsvTest.java
@@ -135,12 +135,6 @@ public class ExportToTsvTest {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
         fBot = new SWTWorkbenchBot();
 
-        /* Close welcome view */
-        SWTBotUtils.closeView("Welcome", fBot);
-
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
-
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
 
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FilterColorEditorTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FilterColorEditorTest.java
index 5233c27fb5..6e53913594 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FilterColorEditorTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FilterColorEditorTest.java
@@ -117,12 +117,6 @@ public class FilterColorEditorTest {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
         fBot = new SWTWorkbenchBot();
 
-        /* Close welcome view */
-        SWTBotUtils.closeView("Welcome", fBot);
-
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
-
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
 
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FilterViewerTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FilterViewerTest.java
index 6c2023e9ef..7e66b5ebf8 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FilterViewerTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FilterViewerTest.java
@@ -105,9 +105,6 @@ public class FilterViewerTest {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout()));
         fBot = new SWTWorkbenchBot();
 
-        SWTBotUtils.closeView("welcome", fBot);
-
-        SWTBotUtils.switchToTracingPerspective();
         /* finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
         fFileLocation = File.createTempFile("sample", ".xml");
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FontEventEditorTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FontEventEditorTest.java
index 25fd212b41..d0f047af84 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FontEventEditorTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FontEventEditorTest.java
@@ -92,12 +92,6 @@ public class FontEventEditorTest {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
         fBot = new SWTWorkbenchBot();
 
-        /* Close welcome view */
-        SWTBotUtils.closeView("Welcome", fBot);
-
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
-
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
     }
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/MovableColumnEventsEditorTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/MovableColumnEventsEditorTest.java
index f9f4c917f8..48d74e95c6 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/MovableColumnEventsEditorTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/MovableColumnEventsEditorTest.java
@@ -90,12 +90,6 @@ public class MovableColumnEventsEditorTest {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout(), ConsoleAppender.SYSTEM_OUT));
         fBot = new SWTWorkbenchBot();
 
-        /* Close welcome view */
-        SWTBotUtils.closeView("Welcome", fBot);
-
-        /* Switch perspectives */
-        SWTBotUtils.switchToTracingPerspective();
-
         /* Finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
     }
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/RawTextEditorTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/RawTextEditorTest.java
index 750648207f..ac996bdaf7 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/RawTextEditorTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/RawTextEditorTest.java
@@ -74,9 +74,6 @@ public class RawTextEditorTest {
         fLogger.addAppender(new NullAppender());
         fBot = new SWTWorkbenchBot();
 
-        SWTBotUtils.closeView("welcome", fBot);
-
-        SWTBotUtils.switchToTracingPerspective();
         /* finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
     }
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/SDViewTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/SDViewTest.java
index bc984434a7..178e33c5d2 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/SDViewTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/SDViewTest.java
@@ -94,9 +94,6 @@ public class SDViewTest {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout()));
         fBot = new SWTWorkbenchBot();
 
-        SWTBotUtils.closeView("welcome", fBot);
-
-        SWTBotUtils.switchToTracingPerspective();
         /* finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
         fFileLocation = File.createTempFile("sample", ".xml");
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TestRefreshTextTrace.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TestRefreshTextTrace.java
index 932137a582..22ae0203ff 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TestRefreshTextTrace.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TestRefreshTextTrace.java
@@ -75,9 +75,6 @@ public class TestRefreshTextTrace {
         fLogger.addAppender(new NullAppender());
         fBot = new SWTWorkbenchBot();
 
-        SWTBotUtils.closeView("welcome", fBot);
-
-        SWTBotUtils.switchToTracingPerspective();
         /* finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
     }
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TestTraceOffsetting.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TestTraceOffsetting.java
index 9e13718ef2..7a6cdbb587 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TestTraceOffsetting.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TestTraceOffsetting.java
@@ -95,9 +95,6 @@ public class TestTraceOffsetting {
         defaultPreferences.put(ITmfTimePreferencesConstants.TIME_ZONE, "GMT-05:00");
         TmfTimestampFormat.updateDefaultFormats();
 
-        SWTBotUtils.closeView("welcome", fBot);
-
-        SWTBotUtils.switchToTracingPerspective();
         /* finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
         fLocation = File.createTempFile("sample", ".xml");
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TmfAlignTimeAxisTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TmfAlignTimeAxisTest.java
index fce9fed726..dfd9a1fd02 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TmfAlignTimeAxisTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TmfAlignTimeAxisTest.java
@@ -40,6 +40,7 @@ import org.eclipse.tracecompass.tmf.ui.project.wizards.NewTmfProjectWizard;
 import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotSash;
 import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotTimeGraph;
 import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils;
+import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.TestingPerspectiveFactory;
 import org.eclipse.tracecompass.tmf.ui.swtbot.tests.views.TimeGraphViewStub;
 import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils;
 import org.eclipse.tracecompass.tmf.ui.views.histogram.HistogramView;
@@ -110,9 +111,6 @@ public class TmfAlignTimeAxisTest {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout()));
         SWTWorkbenchBot bot = new SWTWorkbenchBot();
 
-        SWTBotUtils.closeView("welcome", bot);
-
-        SWTBotUtils.switchToTracingPerspective();
         /* finish waiting for eclipse to load */
         WaitUtils.waitForJobs();
         fLocation = File.createTempFile("sample", ".xml");
@@ -152,8 +150,8 @@ public class TmfAlignTimeAxisTest {
     public void after() {
         SWTWorkbenchBot bot = new SWTWorkbenchBot();
         SWTBotUtils.activeEventsEditor(bot).close();
-        /* Switch back to Tracing perspective since several tests change the perspective */
-        SWTBotUtils.switchToTracingPerspective();
+        /* Switch back to Testing perspective since several tests change the perspective */
+        SWTBotUtils.switchToPerspective(TestingPerspectiveFactory.ID);
         SWTBotUtils.closeSecondaryShells(fBot);
     }
 
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/views/TimeGraphViewTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/views/TimeGraphViewTest.java
index 66235bb439..cbb6d629d0 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/views/TimeGraphViewTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/views/TimeGraphViewTest.java
@@ -146,21 +146,12 @@ public class TimeGraphViewTest {
         }
     };
 
-    private static void resetViews() {
-        SWTBotUtils.switchToTracingPerspective();
-
-        SWTWorkbenchBot bot = new SWTWorkbenchBot();
-        bot.closeAllEditors();
-        SWTBotUtils.closeView("welcome", bot);
-    }
-
     /**
      * Set up for test
      */
     @BeforeClass
     public static void beforeClass() {
         SWTBotUtils.initialize();
-        resetViews();
         SWTBotPreferences.TIMEOUT = 20000; /* 20 second timeout */
         SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
         fLogger.removeAllAppenders();
@@ -300,7 +291,8 @@ public class TimeGraphViewTest {
      */
     @AfterClass
     public static void afterClass() {
-        resetViews();
+        SWTWorkbenchBot bot = new SWTWorkbenchBot();
+        bot.closeAllEditors();
         fLogger.removeAllAppenders();
     }
 
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/AbstractStandardImportWizardTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/AbstractStandardImportWizardTest.java
index 18b777a65e..0cc10b7df9 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/AbstractStandardImportWizardTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/AbstractStandardImportWizardTest.java
@@ -89,7 +89,6 @@ public abstract class AbstractStandardImportWizardTest {
     public void createProject() {
         /* Close welcome view */
         SWTBotUtils.closeView("Welcome", fBot);
-        SWTBotUtils.switchToTracingPerspective();
 
         SWTBotUtils.createProject(PROJECT_NAME);
     }
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/TestImportExportPackageWizard.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/TestImportExportPackageWizard.java
index ac9123cbf8..b1dc76a600 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/TestImportExportPackageWizard.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/TestImportExportPackageWizard.java
@@ -71,7 +71,6 @@ public class TestImportExportPackageWizard {
     private static final String SAVE_IN_TAR_FORMAT = "Save in tar format";
     private static final String SELECT_ALL = "Select All";
     private static final String DESELECT_ALL = "Deselect All";
-    private static final String WELCOME_NAME = "welcome";
     private static final String SWT_BOT_THREAD_NAME = "SWTBot Thread";
     private static final String PROJECT_NAME = "Test";
     private static final String XMLSTUB_ID = "org.eclipse.linuxtools.tmf.core.tests.xmlstub";
@@ -110,9 +109,6 @@ public class TestImportExportPackageWizard {
         fLogger.addAppender(new ConsoleAppender(new SimpleLayout()));
         fBot = new SWTWorkbenchBot();
 
-        SWTBotUtils.closeView(WELCOME_NAME, fBot);
-
-        SWTBotUtils.switchToTracingPerspective();
         /* finish waiting for eclipse to load */
         WaitUtils.waitForJobs();