X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=releng%2Forg.eclipse.tracecompass.integration.swtbot.tests%2Fsrc%2Forg%2Feclipse%2Ftracecompass%2Fintegration%2Fswtbot%2Ftests%2Fprojectexplorer%2FProjectExplorerTraceActionsTest.java;h=675d0a5795c6c10802665031004dfde4786fe0fd;hb=f0beeb4aa356d812661dfa658bfd15a4a1e76e30;hp=1c5609c9473f79d63556970f73ef808721269dfa;hpb=2eddbf55b7b401dd185cb87b87f957b77e78006c;p=deliverable%2Ftracecompass.git 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 1c5609c947..675d0a5795 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 @@ -39,8 +39,10 @@ import org.eclipse.tracecompass.tmf.core.parsers.custom.CustomTxtTraceDefinition import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.ConditionHelpers; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.eclipse.tracecompass.tmf.ui.views.statistics.TmfStatisticsView; import org.eclipse.ui.IEditorReference; +import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -105,7 +107,7 @@ public class ProjectExplorerTraceActionsTest { SWTBotUtils.switchToTracingPerspective(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.createProject(TRACE_PROJECT_NAME); } @@ -118,6 +120,14 @@ public class ProjectExplorerTraceActionsTest { fLogger.removeAllAppenders(); } + /** + * Test tear down method. + */ + @After + public void afterTest() { + SWTBotUtils.closeSecondaryShells(fBot); + } + /** * Test that the expected context menu items are there *