From: Marc-Andre Laperle Date: Wed, 12 Oct 2016 17:00:38 +0000 (-0400) Subject: tmf: Add waitUntil / condition to tmf.ui.tests X-Git-Url: http://git.efficios.com/?p=deliverable%2Ftracecompass.git;a=commitdiff_plain;h=f0beeb4aa356d812661dfa658bfd15a4a1e76e30 tmf: Add waitUntil / condition to tmf.ui.tests This allows us to wait until arbitrary conditions are met, much like SWTBot but without depending on SWTBot. The waitForJobs utility method was converted to use this as an example. Change-Id: Iafa4bb24a1de096dcde25156a4882b8750d7f466 Signed-off-by: Marc-Andre Laperle Reviewed-on: https://git.eclipse.org/r/83051 Reviewed-by: Hudson CI Reviewed-by: Patrick Tasse Tested-by: Patrick Tasse --- diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/META-INF/MANIFEST.MF b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/META-INF/MANIFEST.MF index 14edf821ca..ea9974e502 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/META-INF/MANIFEST.MF +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/META-INF/MANIFEST.MF @@ -30,7 +30,8 @@ Require-Bundle: org.apache.log4j, org.eclipse.tracecompass.analysis.timing.ui, org.eclipse.tracecompass.analysis.os.linux.core, org.eclipse.tracecompass.segmentstore.core, - org.eclipse.tracecompass.lttng2.kernel.core + org.eclipse.tracecompass.lttng2.kernel.core, + org.eclipse.tracecompass.tmf.ui.tests Import-Package: com.google.common.collect;version="15.0.0", org.eclipse.tracecompass.testtraces.ctf, org.swtchart 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 76eaaf3594..3c0787cf43 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 @@ -41,6 +41,7 @@ import org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.latency.Syst import org.eclipse.tracecompass.testtraces.ctf.CtfTestTrace; 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.ui.IViewPart; import org.eclipse.ui.IViewReference; import org.junit.After; @@ -87,7 +88,7 @@ public class SystemCallLatencyDensityViewTest { /* Switch perspectives */ SWTBotUtils.switchToTracingPerspective(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } @@ -180,9 +181,9 @@ public class SystemCallLatencyDensityViewTest { bot.waitUntil(ConditionHelpers.ViewIsClosed(view)); SWTBotUtils.createProject(PROJECT_NAME); SWTBotUtils.openTrace(PROJECT_NAME, tracePath, TRACE_TYPE); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); createDensityViewer(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotTable tableBot = new SWTBotTable(fDensityViewer.getTableViewer().getTable()); bot.waitUntil(ConditionHelpers.isTableCellFilled(tableBot, "1,600", 0, 2)); tableBot.header("Duration").click(); diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyScatterChartViewTest.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyScatterChartViewTest.java index bd8f341606..b09a719b57 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyScatterChartViewTest.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyScatterChartViewTest.java @@ -37,6 +37,7 @@ import org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.latency.Syst import org.eclipse.tracecompass.testtraces.ctf.CtfTestTrace; 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.ui.IViewPart; import org.eclipse.ui.IViewReference; import org.junit.After; @@ -84,7 +85,7 @@ public class SystemCallLatencyScatterChartViewTest { /* Switch perspectives */ SWTBotUtils.switchToTracingPerspective(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } @@ -161,9 +162,9 @@ public class SystemCallLatencyScatterChartViewTest { bot.waitUntil(ConditionHelpers.ViewIsClosed(view)); SWTBotUtils.createProject(PROJECT_NAME); SWTBotUtils.openTrace(PROJECT_NAME, tracePath, TRACE_TYPE); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); createScatterViewer(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); final Chart scatterChart = fScatterChart; assertNotNull(scatterChart); 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 03b6c2827c..187b733f30 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 @@ -44,6 +44,7 @@ import org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.latency.stat import org.eclipse.tracecompass.testtraces.ctf.CtfTestTrace; 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.ui.IViewPart; import org.eclipse.ui.IViewReference; import org.eclipse.ui.PlatformUI; @@ -99,7 +100,7 @@ public class SystemCallLatencyStatisticsTableAnalysisTest { /* Switch perspectives */ switchTracingPerspective(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } @@ -184,9 +185,9 @@ public class SystemCallLatencyStatisticsTableAnalysisTest { bot.waitUntil(ConditionHelpers.ViewIsClosed(view)); SWTBotUtils.createProject(PROJECT_NAME); SWTBotUtils.openTrace(PROJECT_NAME, tracePath, TRACE_TYPE); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); createTree(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); assertEquals("1.000 µs", fTreeBot.cell(0, MIN_COL)); assertEquals("5.904 s", fTreeBot.cell(0, MAX_COL)); assertEquals("15.628 ms", fTreeBot.cell(0, AVERAGE_COL)); // double diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyTableAnalysisTest.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyTableAnalysisTest.java index a5b312f328..d755726d66 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyTableAnalysisTest.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyTableAnalysisTest.java @@ -44,6 +44,7 @@ import org.eclipse.tracecompass.segmentstore.core.BasicSegment; import org.eclipse.tracecompass.testtraces.ctf.CtfTestTrace; 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.ui.IViewPart; import org.eclipse.ui.IViewReference; import org.eclipse.ui.PlatformUI; @@ -96,7 +97,7 @@ public class SystemCallLatencyTableAnalysisTest { /* Switch perspectives */ switchTracingPerspective(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } @@ -360,9 +361,9 @@ public class SystemCallLatencyTableAnalysisTest { bot.waitUntil(ConditionHelpers.ViewIsClosed(view)); SWTBotUtils.createProject(PROJECT_NAME); SWTBotUtils.openTrace(PROJECT_NAME, tracePath, TRACE_TYPE); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); createTable(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotTable tableBot = new SWTBotTable(fTable.getTableViewer().getTable()); bot.waitUntil(ConditionHelpers.isTableCellFilled(tableBot, "24,100", 0, 2)); tableBot.header("Duration").click(); diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/META-INF/MANIFEST.MF b/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/META-INF/MANIFEST.MF index 1fb54b8fea..6c8376e45e 100644 --- a/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/META-INF/MANIFEST.MF +++ b/ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/META-INF/MANIFEST.MF @@ -19,7 +19,8 @@ Require-Bundle: org.junit;bundle-version="4.0.0", org.eclipse.tracecompass.tmf.ui.swtbot.tests, org.eclipse.tracecompass.tmf.ctf.core;bundle-version="2.0.0", org.eclipse.tracecompass.tmf.ctf.core.tests, - org.eclipse.tracecompass.common.core;bundle-version="2.0.0" + org.eclipse.tracecompass.common.core;bundle-version="2.0.0", + org.eclipse.tracecompass.tmf.ui.tests Import-Package: org.apache.log4j, org.apache.log4j.varia, org.eclipse.swtbot.eclipse.finder, 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 204fef13e8..22b52fd025 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 @@ -48,6 +48,7 @@ import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.eclipse.tracecompass.tmf.ui.editors.TmfEventsEditor; 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.histogram.HistogramView; import org.eclipse.ui.IViewPart; import org.eclipse.ui.IViewReference; @@ -97,7 +98,7 @@ public abstract class AbstractImportAndReadSmokeTest { SWTBotUtils.switchToTracingPerspective(); /* finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** @@ -143,7 +144,7 @@ public abstract class AbstractImportAndReadSmokeTest { text.setText(traceProjectName); fBot.button("Finish").click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** @@ -178,7 +179,7 @@ public abstract class AbstractImportAndReadSmokeTest { button.click(); } fBot.waitUntil(Conditions.shellCloses(shell)); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** @@ -226,7 +227,7 @@ public abstract class AbstractImportAndReadSmokeTest { } }); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.delay(1000); final CtfTmfEvent desiredEvent2 = getEvent(10000); @@ -241,17 +242,17 @@ public abstract class AbstractImportAndReadSmokeTest { final TmfSelectionRangeUpdatedSignal signal = new TmfSelectionRangeUpdatedSignal(hv, desiredEvent1.getTimestamp()); final TmfSelectionRangeUpdatedSignal signal2 = new TmfSelectionRangeUpdatedSignal(hv, desiredEvent2.getTimestamp()); hv.updateTimeRange(100000); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); hv.selectionRangeUpdated(signal); hv.broadcast(signal); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.delay(1000); hv.updateTimeRange(1000000000); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); hv.selectionRangeUpdated(signal2); hv.broadcast(signal2); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.delay(1000); assertNotNull(hv); } 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 a6888ccc1a..192cda95a7 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 @@ -38,6 +38,7 @@ import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences; import org.eclipse.swtbot.swt.finder.waits.Conditions; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -179,7 +180,7 @@ public class TestInvalidCtfTrace { SWTBotUtils.switchToTracingPerspective(); /* finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.createProject(PROJET_NAME); } diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/META-INF/MANIFEST.MF index aa0c8dd6b8..e407275c8a 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/META-INF/MANIFEST.MF +++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/META-INF/MANIFEST.MF @@ -27,7 +27,8 @@ Require-Bundle: org.apache.log4j, org.eclipse.tracecompass.lttng2.control.core, org.eclipse.tracecompass.lttng2.control.ui, org.eclipse.tracecompass.lttng2.control.ui.tests;bundle-version="2.0.0", - org.eclipse.tracecompass.ctf.core.tests + org.eclipse.tracecompass.ctf.core.tests, + org.eclipse.tracecompass.tmf.ui.tests Export-Package: org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests Import-Package: com.google.common.collect, org.eclipse.tracecompass.testtraces.ctf;version="1.0.0" diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewAllEventsTest.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewAllEventsTest.java index 95fa5bb75d..3e604a5d91 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewAllEventsTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewAllEventsTest.java @@ -18,6 +18,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.eclipse.tracecompass.internal.lttng2.control.core.model.TraceSessionState; 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.junit.Test; import org.junit.runner.RunWith; @@ -81,7 +82,7 @@ public class ControlViewAllEventsTest extends ControlViewTest { // all tracepoint events and syscalls shell.bot().radioInGroup(ControlViewSwtBotUtil.GROUP_SELECT_NAME, ControlViewSwtBotUtil.ALL_EVENT_GROUP_NAME).click(); shell.bot().button(ControlViewSwtBotUtil.DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot.waitUntil(ConditionHelpers.IsTreeChildNodeAvailable(ControlViewSwtBotUtil.KERNEL_DOMAIN_NAME, sessionItem)); diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewExcludeEventsTest.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewExcludeEventsTest.java index 71296a1e4e..6b14540429 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewExcludeEventsTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewExcludeEventsTest.java @@ -26,6 +26,7 @@ import org.eclipse.tracecompass.internal.lttng2.control.ui.views.model.ITraceCon import org.eclipse.tracecompass.internal.lttng2.control.ui.views.model.impl.TraceEventComponent; 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.junit.Test; import org.junit.runner.RunWith; @@ -117,7 +118,7 @@ public class ControlViewExcludeEventsTest extends ControlViewTest { // Click the Ok at the bottom of the dialog window shell.bot().button(ControlViewSwtBotUtil.DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot.waitUntil(ConditionHelpers.IsTreeChildNodeAvailable(ControlViewSwtBotUtil.UST_DOMAIN_NAME, sessionItem)); diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewKernelFilterTest.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewKernelFilterTest.java index b78b17b920..697854e524 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewKernelFilterTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewKernelFilterTest.java @@ -25,6 +25,7 @@ import org.eclipse.tracecompass.internal.lttng2.control.ui.views.model.ITraceCon import org.eclipse.tracecompass.internal.lttng2.control.ui.views.model.impl.TraceEventComponent; 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.junit.Test; import org.junit.runner.RunWith; @@ -117,7 +118,7 @@ public class ControlViewKernelFilterTest extends ControlViewTest { SWTBotText filterText = shell.bot().textInGroup(ControlViewSwtBotUtil.FILTER_EXPRESSION_LABEL); filterText.setText(FILTER_EXPRESSION); shell.bot().button(ControlViewSwtBotUtil.DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot.waitUntil(ConditionHelpers.IsTreeChildNodeAvailable(ControlViewSwtBotUtil.KERNEL_DOMAIN_NAME, sessionItem)); @@ -174,7 +175,7 @@ public class ControlViewKernelFilterTest extends ControlViewTest { SWTBotText filterText = shell.bot().textInGroup(ControlViewSwtBotUtil.FILTER_EXPRESSION_LABEL); filterText.setText(FILTER_EXPRESSION); shell.bot().button(ControlViewSwtBotUtil.DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotTreeItem sessionItem = SWTBotUtils.getTreeItem(fBot, fTree, getNodeName(), diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewLoggerTest.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewLoggerTest.java index 43e623c67c..2844f87d65 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewLoggerTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewLoggerTest.java @@ -21,6 +21,7 @@ import org.eclipse.tracecompass.internal.lttng2.control.core.model.TraceSessionS import org.eclipse.tracecompass.internal.lttng2.control.ui.views.ControlView; 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.junit.Test; /** @@ -143,7 +144,7 @@ public class ControlViewLoggerTest extends ControlViewTest { // Click the Ok at the bottom of the dialog window shell.bot().button(ControlViewSwtBotUtil.DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot.waitUntil(ConditionHelpers.IsTreeChildNodeAvailable(domainName, sessionItem)); // Assert that the domain is correct @@ -183,7 +184,7 @@ public class ControlViewLoggerTest extends ControlViewTest { // Click the Ok at the bottom of the dialog window shell.bot().button(ControlViewSwtBotUtil.DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot.waitUntil(ConditionHelpers.IsTreeChildNodeAvailable(domainName, sessionItem)); // Assert that the domain is correct @@ -222,7 +223,7 @@ public class ControlViewLoggerTest extends ControlViewTest { shell.bot().ccomboBoxInGroup(LOGLEVEL_PROPERTY_NAME).setSelection(logLevel); // Click the Ok at the bottom of the dialog window shell.bot().button(ControlViewSwtBotUtil.DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot.waitUntil(ConditionHelpers.IsTreeChildNodeAvailable(domainName, sessionItem)); // Assert that the domain is correct @@ -253,7 +254,7 @@ public class ControlViewLoggerTest extends ControlViewTest { shell.bot().textInGroup("Specific logger").setText(ControlViewSwtBotUtil.SPECIFIC_LOGGER_NAME1 + "," + ControlViewSwtBotUtil.SPECIFIC_LOGGER_NAME2); // Click the Ok at the bottom of the dialog window shell.bot().button(ControlViewSwtBotUtil.DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot.waitUntil(ConditionHelpers.IsTreeChildNodeAvailable(domainName, sessionItem)); // Assert that the domain is correct diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewProfileTest.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewProfileTest.java index f7db9d003d..86d6d2b093 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewProfileTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewProfileTest.java @@ -20,6 +20,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; 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.junit.Test; import org.junit.runner.RunWith; @@ -94,7 +95,7 @@ public class ControlViewProfileTest extends ControlViewTest { SWTBotShell shell = fBot.shell(ControlViewSwtBotUtil.SAVE_DIALOG_TITLE).activate(); shell.bot().button(ControlViewSwtBotUtil.CONFIRM_DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** @@ -120,7 +121,7 @@ public class ControlViewProfileTest extends ControlViewTest { profileItem.click(); shell.bot().button(ControlViewSwtBotUtil.CONFIRM_DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); sessionGroupItem = SWTBotUtils.getTreeItem(fBot, fTree, getNodeName(), ControlViewSwtBotUtil.SESSION_GROUP_NAME); diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewSpecificEventTest.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewSpecificEventTest.java index 6f0e251d55..ddd4056793 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewSpecificEventTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewSpecificEventTest.java @@ -23,6 +23,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.eclipse.tracecompass.internal.lttng2.control.core.model.TraceSessionState; 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.junit.Test; import org.junit.runner.RunWith; @@ -153,7 +154,7 @@ public class ControlViewSpecificEventTest extends ControlViewTest { // Click Ok to quit the dialog window shell.bot().button(ControlViewSwtBotUtil.DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); // Wait until the child of Sessions is activated fBot.waitUntil(ConditionHelpers.IsTreeChildNodeAvailable(ControlViewSwtBotUtil.KERNEL_DOMAIN_NAME, sessionItem)); diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewTest.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewTest.java index 8343f95374..f5c6aefe82 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewTest.java @@ -55,6 +55,7 @@ import org.eclipse.tracecompass.tmf.ui.project.model.TmfProjectElement; import org.eclipse.tracecompass.tmf.ui.project.model.TmfProjectRegistry; 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.ui.IViewPart; import org.junit.After; import org.junit.Before; @@ -126,7 +127,7 @@ public class ControlViewTest { SWTBotUtils.closeView("welcome", fBot); /* finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.switchToPerspective(PERSPECTIVE_ID); } @@ -140,7 +141,7 @@ public class ControlViewTest { @Before public void beforeTest() throws Exception { SWTBotUtils.openView(ControlView.ID); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path("testfiles" + File.separator + getTestStream()), null); File testfile = new File(FileLocator.toFileURL(location).toURI()); fTestFile = testfile.getAbsolutePath(); @@ -240,7 +241,7 @@ public class ControlViewTest { nodeItem.select(); SWTBotMenu menuBot = nodeItem.contextMenu(ControlViewSwtBotUtil.CONNECT_MENU_ITEM); menuBot.click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot.waitUntil(ConditionHelpers.IsTreeChildNodeAvailable(ControlViewSwtBotUtil.SESSION_GROUP_NAME, nodeItem)); @@ -267,7 +268,7 @@ public class ControlViewTest { sessionText.setText(SESSION_NAME); shell.bot().button(ControlViewSwtBotUtil.DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); sessionGroupItem.expand(); @@ -302,7 +303,7 @@ public class ControlViewTest { SWTBotTreeItem allItem = SWTBotUtils.getTreeItem(fBot, tracepointsTree, ControlViewSwtBotUtil.ALL_TREE_NODE); allItem.check(); shell.bot().button(ControlViewSwtBotUtil.DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot.waitUntil(ConditionHelpers.IsTreeChildNodeAvailable(ControlViewSwtBotUtil.KERNEL_DOMAIN_NAME, sessionItem)); @@ -352,7 +353,7 @@ public class ControlViewTest { SWTBotTreeItem allItem = SWTBotUtils.getTreeItem(fBot, syscallsTree, ControlViewSwtBotUtil.ALL_TREE_NODE); allItem.check(); shell.bot().button(ControlViewSwtBotUtil.DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot.waitUntil(ConditionHelpers.IsTreeChildNodeAvailable(ControlViewSwtBotUtil.KERNEL_DOMAIN_NAME, sessionItem)); @@ -400,7 +401,7 @@ public class ControlViewTest { SWTBotTreeItem closeItem = SWTBotUtils.getTreeItem(fBot, syscallsTree, ControlViewSwtBotUtil.ALL_TREE_NODE, ControlViewSwtBotUtil.SYSCALL_CLOSE_EVENT); closeItem.check(); shell.bot().button(ControlViewSwtBotUtil.DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot.waitUntil(ConditionHelpers.IsTreeChildNodeAvailable(ControlViewSwtBotUtil.KERNEL_DOMAIN_NAME, sessionItem)); @@ -466,7 +467,7 @@ public class ControlViewTest { shell.bot().radioInGroup(ControlViewSwtBotUtil.UST_GROUP_NAME, ControlViewSwtBotUtil.DOMAIN_GROUP_NAME).click(); shell.bot().radioInGroup(ControlViewSwtBotUtil.BUFFERTYPE_PER_UID, ControlViewSwtBotUtil.BUFFERTYPE_GROUP_NAME).click(); shell.bot().button(ControlViewSwtBotUtil.DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot.waitUntil(ConditionHelpers.IsTreeChildNodeAvailable(ControlViewSwtBotUtil.UST_DOMAIN_NAME, sessionItem)); } @@ -489,7 +490,7 @@ public class ControlViewTest { SWTBotTree tracepointsTree = shell.bot().tree(); tracepointsTree.select(ControlViewSwtBotUtil.ALL_TREE_NODE); shell.bot().button(ControlViewSwtBotUtil.DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotTreeItem eventItem = SWTBotUtils.getTreeItem(fBot, fTree, getNodeName(), @@ -517,11 +518,11 @@ public class ControlViewTest { if (state == TraceSessionState.ACTIVE) { SWTBotMenu menuBot = sessionItem.contextMenu(ControlViewSwtBotUtil.START_MENU_ITEM); menuBot.click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } else { SWTBotMenu menuBot = sessionItem.contextMenu(ControlViewSwtBotUtil.STOP_MENU_ITEM); menuBot.click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } TraceSessionComponent sessionComp = ControlViewSwtBotUtil.getSessionComponent(fNode, getSessionName()); @@ -544,7 +545,7 @@ public class ControlViewTest { SWTBotShell shell = fBot.shell(ControlViewSwtBotUtil.DESTROY_CONFIRM_DIALOG_TITLE).activate(); shell.bot().button(ControlViewSwtBotUtil.CONFIRM_DIALOG_OK_BUTTON).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotTreeItem sessionGroupItem = SWTBotUtils.getTreeItem(fBot, fTree, getNodeName(), ControlViewSwtBotUtil.SESSION_GROUP_NAME); @@ -561,7 +562,7 @@ public class ControlViewTest { nodeItem.select(); SWTBotMenu menuBot = nodeItem.contextMenu(ControlViewSwtBotUtil.DISCONNECT_MENU_ITEM); menuBot.click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); // Verify that node is connected fBot.waitUntil(ControlViewSwtBotUtil.isStateChanged(fNode, TargetNodeState.DISCONNECTED)); @@ -659,7 +660,7 @@ public class ControlViewTest { shell.bot().waitUntil(Conditions.widgetIsEnabled(button)); button.click(); fBot.waitUntil(Conditions.shellCloses(shell)); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } private static String prepareAndVerifyExperimentHandling(SWTBot bot, boolean createExperiment, boolean defaultExperiment, IPath path) { diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/model/component/TraceControlTestFacility.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/model/component/TraceControlTestFacility.java index 7b6e5ebeaa..ead506ca01 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/model/component/TraceControlTestFacility.java +++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/model/component/TraceControlTestFacility.java @@ -24,7 +24,7 @@ import org.eclipse.tracecompass.internal.lttng2.control.ui.views.ControlView; import org.eclipse.tracecompass.internal.lttng2.control.ui.views.model.ITraceControlComponent; import org.eclipse.tracecompass.internal.lttng2.control.ui.views.model.impl.TargetNodeComponent; import org.eclipse.tracecompass.internal.lttng2.control.ui.views.model.impl.TraceSessionComponent; -import org.eclipse.tracecompass.tmf.ui.tests.shared.JobUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.eclipse.ui.IViewPart; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; @@ -182,7 +182,7 @@ public class TraceControlTestFacility { * Waits for all Eclipse jobs to finish */ public void waitForJobs() { - JobUtils.waitForJobs(); + WaitUtils.waitForJobs(); } private IViewPart showView(String viewId) throws PartInitException { diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/META-INF/MANIFEST.MF index 52675b72e2..0fc2af7157 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/META-INF/MANIFEST.MF +++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/META-INF/MANIFEST.MF @@ -30,6 +30,7 @@ Require-Bundle: org.apache.log4j, org.eclipse.ui.views, org.junit, org.eclipse.tracecompass.analysis.graph.ui, - org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests + org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests, + org.eclipse.tracecompass.tmf.ui.tests Import-Package: org.eclipse.tracecompass.testtraces.ctf, org.swtchart;version="0.7.0" diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java index 48b606c824..8ebf6e0c97 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java @@ -37,6 +37,7 @@ import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTraceUtils; import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace; import org.eclipse.tracecompass.tmf.ui.editors.TmfEventsEditor; 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.histogram.HistogramView; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorReference; @@ -100,17 +101,17 @@ public class ImportAndReadKernelSmokeTest extends KernelTestBase { final TmfSelectionRangeUpdatedSignal signal = new TmfSelectionRangeUpdatedSignal(hv, fDesired1.getTimestamp()); final TmfSelectionRangeUpdatedSignal signal2 = new TmfSelectionRangeUpdatedSignal(hv, fDesired2.getTimestamp()); hv.updateTimeRange(100000); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); hv.selectionRangeUpdated(signal); hv.broadcast(signal); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.delay(1000); hv.updateTimeRange(1000000000); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); hv.selectionRangeUpdated(signal2); hv.broadcast(signal2); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.delay(1000); assertNotNull(hv); } diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/KernelTestBase.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/KernelTestBase.java index 2c826f7828..73edaff79b 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/KernelTestBase.java +++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/KernelTestBase.java @@ -33,6 +33,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.tracecompass.ctf.core.tests.shared.LttngTraceGenerator; 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.ui.PlatformUI; import org.eclipse.ui.WorkbenchException; import org.junit.After; @@ -88,7 +89,7 @@ public abstract class KernelTestBase { /* Create the trace project */ SWTBotUtils.createProject(TRACE_PROJECT_NAME); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/OpenTraceStressTest.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/OpenTraceStressTest.java index 14102c2280..a2255219b9 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/OpenTraceStressTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/OpenTraceStressTest.java @@ -36,6 +36,7 @@ import org.eclipse.tracecompass.testtraces.ctf.CtfTestTrace; import org.eclipse.tracecompass.tmf.core.analysis.Messages; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTraceUtils; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -74,7 +75,7 @@ public class OpenTraceStressTest { SWTBotUtils.switchToPerspective(KERNEL_PERSPECTIVE_ID); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ResourcesAndCpuViewTest.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ResourcesAndCpuViewTest.java index 28dcc424da..b87086e53c 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ResourcesAndCpuViewTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ResourcesAndCpuViewTest.java @@ -32,6 +32,7 @@ import org.eclipse.tracecompass.tmf.core.signal.TmfSignalManager; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.hamcrest.Matcher; import org.junit.Before; import org.junit.Test; @@ -105,7 +106,7 @@ public class ResourcesAndCpuViewTest extends KernelTestBase { private static void broadcast(TmfCpuSelectedSignal signal) { UIThreadRunnable.syncExec(() -> TmfSignalManager.dispatchSignal(signal)); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } private String getTitle() { diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/META-INF/MANIFEST.MF index 60e24b63a5..5a059032ce 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/META-INF/MANIFEST.MF +++ b/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/META-INF/MANIFEST.MF @@ -25,7 +25,8 @@ Require-Bundle: org.apache.log4j, org.junit, org.eclipse.tracecompass.lttng2.ust.core, org.eclipse.tracecompass.lttng2.ust.ui, - org.swtchart + org.swtchart, + org.eclipse.tracecompass.tmf.ui.tests Export-Package: org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests Import-Package: com.google.common.collect, org.eclipse.tracecompass.testtraces.ctf;version="1.1.1" diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/CallStackViewTest.java b/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/CallStackViewTest.java index 1bbad56161..25f7d5f00f 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/CallStackViewTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/CallStackViewTest.java @@ -41,6 +41,7 @@ import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTraceUtils; 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.callstack.CallStackView; import org.junit.After; import org.junit.Before; @@ -156,7 +157,7 @@ public class CallStackViewTest { SWTBotUtils.switchToTracingPerspective(); /* finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** @@ -171,7 +172,7 @@ public class CallStackViewTest { final File file = new File(CtfTmfTestTraceUtils.getTrace(cygProfile).getPath()); SWTBotUtils.openTrace(PROJECT_NAME, file.getAbsolutePath(), UST_ID); SWTBotUtils.openView(CallStackView.ID); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** @@ -212,7 +213,7 @@ public class CallStackViewTest { final SWTBotView viewBot = fBot.viewById(CallStackView.ID); viewBot.setFocus(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); List names = getVisibleStackFrames(viewBot); assertArrayEquals(STACK_FRAMES[0], names.toArray()); } @@ -231,7 +232,7 @@ public class CallStackViewTest { viewBot.toolbarPushButton(SELECT_NEXT_STATE_CHANGE).click(); currentEventOffset++; fBot.waitUntil(ConditionHelpers.selectionInEventsTable(fBot, TIMESTAMPS[currentEventOffset])); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); assertArrayEquals(STACK_FRAMES[currentEventOffset], getVisibleStackFrames(viewBot).toArray()); } @@ -240,20 +241,20 @@ public class CallStackViewTest { viewBot.toolbarPushButton(SELECT_PREVIOUS_STATE_CHANGE).click(); currentEventOffset--; fBot.waitUntil(ConditionHelpers.selectionInEventsTable(fBot, TIMESTAMPS[currentEventOffset])); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); assertArrayEquals(STACK_FRAMES[currentEventOffset], getVisibleStackFrames(viewBot).toArray()); } // move up and down once to make sure it doesn't explode viewBot.toolbarPushButton(SELECT_PREVIOUS_ITEM).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); viewBot.toolbarPushButton(SELECT_NEXT_ITEM).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); // Zoom in and out too viewBot.toolbarPushButton(ZOOM_IN).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); viewBot.toolbarPushButton(ZOOM_OUT).click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** @@ -269,7 +270,7 @@ public class CallStackViewTest { viewBot.toolbarToggleButton(SORT_BY_ID).click(); viewBot.toolbarToggleButton(SORT_BY_START).click(); viewBot.setFocus(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); List names = getVisibleStackFrames(viewBot); assertArrayEquals(STACK_FRAMES[0], names.toArray()); } @@ -305,7 +306,7 @@ public class CallStackViewTest { viewBot.setFocus(); // no way to load mappings yet! :( SWTBotTree tree = viewBot.bot().tree(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); List names = new ArrayList<>(); for (SWTBotTreeItem swtBotTreeItem : tree.getAllItems()) { for (SWTBotTreeItem items : swtBotTreeItem.getItems()) { diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/MemoryUsageViewTest.java b/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/MemoryUsageViewTest.java index d74b68103b..fcd1320cdb 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/MemoryUsageViewTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/MemoryUsageViewTest.java @@ -28,6 +28,7 @@ import org.eclipse.tracecompass.testtraces.ctf.CtfTestTrace; import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTraceUtils; 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.hamcrest.Matcher; import org.junit.After; import org.junit.Before; @@ -73,7 +74,7 @@ public class MemoryUsageViewTest { SWTBotUtils.switchToTracingPerspective(); /* finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** @@ -88,7 +89,7 @@ public class MemoryUsageViewTest { final File file = new File(CtfTmfTestTraceUtils.getTrace(cygProfile).getPath()); SWTBotUtils.openTrace(PROJECT_NAME, file.getAbsolutePath(), UST_ID); SWTBotUtils.openView(MemoryUsageView.ID); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** diff --git a/pcap/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/META-INF/MANIFEST.MF b/pcap/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/META-INF/MANIFEST.MF index 0058131158..678f7fed89 100644 --- a/pcap/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/META-INF/MANIFEST.MF +++ b/pcap/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/META-INF/MANIFEST.MF @@ -22,4 +22,5 @@ Require-Bundle: org.apache.log4j, org.eclipse.tracecompass.tmf.pcap.core.tests, org.eclipse.tracecompass.tmf.ui, org.eclipse.tracecompass.tmf.pcap.ui, - org.eclipse.tracecompass.tmf.ui.swtbot.tests + org.eclipse.tracecompass.tmf.ui.swtbot.tests, + org.eclipse.tracecompass.tmf.ui.tests diff --git a/pcap/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/pcap/ui/swtbot/tests/ImportAndReadPcapTest.java b/pcap/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/pcap/ui/swtbot/tests/ImportAndReadPcapTest.java index 28e9eac2be..227a6dc9fb 100644 --- a/pcap/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/pcap/ui/swtbot/tests/ImportAndReadPcapTest.java +++ b/pcap/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/pcap/ui/swtbot/tests/ImportAndReadPcapTest.java @@ -51,6 +51,7 @@ import org.eclipse.tracecompass.tmf.ui.project.model.TmfProjectRegistry; import org.eclipse.tracecompass.tmf.ui.project.model.TmfTraceFolder; 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.ui.IEditorPart; import org.eclipse.ui.IEditorReference; import org.eclipse.ui.IViewPart; @@ -104,7 +105,7 @@ public class ImportAndReadPcapTest { /* Switch perspectives */ switchNetworkPerspective(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** @@ -158,7 +159,7 @@ public class ImportAndReadPcapTest { assertNotNull(botTree); final TmfSelectionRangeUpdatedSignal signal = new TmfSelectionRangeUpdatedSignal(slv, fDesired1.getTimestamp()); slv.broadcast(signal); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); // FIXME This is a race condition: // TmfEventsTable launches an async exec that may be run after the wait // for jobs. This last delay catches it. @@ -187,7 +188,7 @@ public class ImportAndReadPcapTest { } SWTBotUtils.delay(1000); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } private void openEditor() { @@ -219,7 +220,7 @@ public class ImportAndReadPcapTest { } }); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.delay(1000); assertNotNull(tmfEd); } diff --git a/releng/org.eclipse.tracecompass.integration.swtbot.tests/META-INF/MANIFEST.MF b/releng/org.eclipse.tracecompass.integration.swtbot.tests/META-INF/MANIFEST.MF index 78c92b8737..bea8fffa66 100644 --- a/releng/org.eclipse.tracecompass.integration.swtbot.tests/META-INF/MANIFEST.MF +++ b/releng/org.eclipse.tracecompass.integration.swtbot.tests/META-INF/MANIFEST.MF @@ -26,5 +26,6 @@ Require-Bundle: org.apache.log4j, org.eclipse.tracecompass.tmf.ui.swtbot.tests, org.eclipse.ui, org.eclipse.ui.views.log, - org.junit + org.junit, + org.eclipse.tracecompass.tmf.ui.tests Import-Package: com.google.common.collect;version="15.0.0" 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 a35085cc7f..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,6 +39,7 @@ 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; @@ -106,7 +107,7 @@ public class ProjectExplorerTraceActionsTest { SWTBotUtils.switchToTracingPerspective(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + 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 a41bb906b0..050947dd33 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 @@ -41,6 +41,7 @@ import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager; import org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests.SWTBotImportWizardUtils; 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.ui.IPageLayout; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -155,7 +156,7 @@ public class ProjectExplorerTracesFolderTest { SWTBotUtils.switchToTracingPerspective(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.createProject(TRACE_PROJECT_NAME); } diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/META-INF/MANIFEST.MF b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/META-INF/MANIFEST.MF index 127c1aa1f7..fcee0a678d 100644 --- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/META-INF/MANIFEST.MF +++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/META-INF/MANIFEST.MF @@ -32,6 +32,7 @@ Require-Bundle: org.apache.log4j, org.eclipse.tracecompass.lttng2.kernel.core, org.eclipse.tracecompass.tmf.analysis.xml.ui, org.eclipse.tracecompass.tmf.analysis.xml.core.tests, - org.eclipse.tracecompass.tmf.analysis.xml.core + org.eclipse.tracecompass.tmf.analysis.xml.core, + org.eclipse.tracecompass.tmf.ui.tests Import-Package: org.eclipse.tracecompass.testtraces.ctf, org.swtchart diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternDensityViewTest.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternDensityViewTest.java index 626d851696..491b863ad6 100644 --- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternDensityViewTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternDensityViewTest.java @@ -29,7 +29,7 @@ import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.density.Ab import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.table.AbstractSegmentStoreTableViewer; import org.eclipse.tracecompass.internal.tmf.analysis.xml.ui.views.latency.PatternDensityView; 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.ui.IViewPart; import org.eclipse.ui.IViewReference; import org.junit.Test; @@ -114,7 +114,7 @@ public class PatternDensityViewTest extends PatternLatencyViewTestBase { @Test public void testWithTrace() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException { setDensityViewer(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); //Test the table content SWTBotTable tableBot = new SWTBotTable(fDensityViewer.getTableViewer().getTable()); diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternLatencyTableViewTest.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternLatencyTableViewTest.java index c1bbd1e644..690b17a8b5 100644 --- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternLatencyTableViewTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternLatencyTableViewTest.java @@ -18,7 +18,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.table.AbstractSegmentStoreTableViewer; import org.eclipse.tracecompass.internal.tmf.analysis.xml.ui.views.latency.PatternLatencyTableView; 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.ui.IViewPart; import org.eclipse.ui.IViewReference; import org.junit.Test; @@ -43,7 +43,7 @@ public class PatternLatencyTableViewTest extends PatternLatencyViewTestBase { @Test public void testData() { getTable(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); assertNotNull(fTable); SWTBotTable tableBot = new SWTBotTable(fTable.getTableViewer().getTable()); 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 77abea0c0e..2d851b5076 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 @@ -27,6 +27,7 @@ import org.eclipse.tracecompass.internal.tmf.analysis.xml.core.module.XmlUtils; import org.eclipse.tracecompass.testtraces.ctf.CtfTestTrace; import org.eclipse.tracecompass.tmf.analysis.xml.core.tests.common.TmfXmlTestFiles; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -69,7 +70,7 @@ public abstract class PatternLatencyViewTestBase { /* Switch perspectives */ SWTBotUtils.switchToTracingPerspective(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot = new SWTWorkbenchBot(); @@ -85,7 +86,7 @@ public abstract class PatternLatencyViewTestBase { String tracePath = FileLocator.toFileURL(CtfTestTrace.ARM_64_BIT_HEADER.getTraceURL()).getPath(); SWTBotUtils.createProject(PROJECT_NAME); SWTBotUtils.openTrace(PROJECT_NAME, tracePath, TRACE_TYPE); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } catch (IOException e) { fail("Failed to get the trace."); } diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternScatterChartViewTest.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternScatterChartViewTest.java index 2fd21b944a..4996832552 100644 --- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternScatterChartViewTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternScatterChartViewTest.java @@ -24,7 +24,7 @@ import org.eclipse.swtbot.swt.finder.results.Result; import org.eclipse.swtbot.swt.finder.widgets.AbstractSWTBotControl; import org.eclipse.tracecompass.internal.tmf.analysis.xml.ui.views.latency.PatternScatterGraphView; 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.ui.IViewPart; import org.eclipse.ui.IViewReference; import org.junit.Test; @@ -70,7 +70,7 @@ public class PatternScatterChartViewTest extends PatternLatencyViewTestBase { @Test public void testWithTrace() { setChart(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); final Chart scatterChart = fScatterChart; assertNotNull(scatterChart); fBot.waitUntil(ConditionHelpers.numberOfSeries(scatterChart, 1)); diff --git a/tmf/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/META-INF/MANIFEST.MF b/tmf/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/META-INF/MANIFEST.MF index 461414e0b0..a6f3985e93 100644 --- a/tmf/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/META-INF/MANIFEST.MF +++ b/tmf/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/META-INF/MANIFEST.MF @@ -21,7 +21,8 @@ Require-Bundle: org.junit;bundle-version="4.0.0", org.eclipse.tracecompass.lttng2.kernel.core, org.eclipse.swtbot.junit4_x, org.eclipse.swtbot.swt.finder, - org.eclipse.tracecompass.tmf.ctf.core.tests + org.eclipse.tracecompass.tmf.ctf.core.tests, + org.eclipse.tracecompass.tmf.ui.tests Import-Package: org.apache.log4j, org.apache.log4j.varia, org.eclipse.swtbot.eclipse.finder, 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 7e6654bf0d..6b66637ffa 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 @@ -49,6 +49,7 @@ import org.eclipse.tracecompass.tmf.ui.project.model.TmfProjectRegistry; import org.eclipse.tracecompass.tmf.ui.project.model.TmfTraceElement; 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.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -115,7 +116,7 @@ public class FetchRemoteTracesTest { SWTBotUtils.switchToTracingPerspective(); /* finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } private static class TraceCountCondition extends DefaultCondition { @@ -329,7 +330,7 @@ public class FetchRemoteTracesTest { private static void testImport(Runnable selectionFunctor, Runnable verifyTracesFunctor) { SWTBotUtils.createProject(PROJECT_NAME); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotView projectExplorerBot = fBot.viewByTitle(PROJECT_EXPLORER); assertNotNull("Cannot find " + PROJECT_EXPLORER, projectExplorerBot); projectExplorerBot.show(); @@ -367,7 +368,7 @@ public class FetchRemoteTracesTest { fBot.waitUntil(Conditions.widgetIsEnabled(button)); button.click(); fBot.waitUntil(Conditions.shellCloses(shell)); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); verifyTracesFunctor.run(); fBot.closeAllEditors(); diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/perf/org/eclipse/tracecompass/tmf/ui/swtbot/tests/perf/views/ViewsResponseTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/perf/org/eclipse/tracecompass/tmf/ui/swtbot/tests/perf/views/ViewsResponseTest.java index 3f839491a2..ed6d377b3c 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/perf/org/eclipse/tracecompass/tmf/ui/swtbot/tests/perf/views/ViewsResponseTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/perf/org/eclipse/tracecompass/tmf/ui/swtbot/tests/perf/views/ViewsResponseTest.java @@ -30,6 +30,7 @@ import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; 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.timegraph.AbstractTimeGraphView; import org.eclipse.ui.IWorkbenchPart; import org.junit.After; @@ -77,7 +78,7 @@ public abstract class ViewsResponseTest { /* Prepare the workspace */ prepareWorkspace(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); /* Create project */ SWTBotUtils.createProject(PROJECT_NAME); @@ -132,7 +133,7 @@ public abstract class ViewsResponseTest { // Make sure all the analyses we'll need are done ITmfTrace trace = TmfTraceManager.getInstance().getActiveTrace(); beforeRunningTest(trace); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotView view; @@ -194,7 +195,7 @@ public abstract class ViewsResponseTest { Thread.sleep(1000); } catch (InterruptedException e) { } - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } // TODO: Add some vertical scrollings. With eventual 2D queries, that will diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/AbstractPerspectiveChecker.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/AbstractPerspectiveChecker.java index 288606c4f0..50375a0226 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/AbstractPerspectiveChecker.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/AbstractPerspectiveChecker.java @@ -25,6 +25,7 @@ import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.eclipse.ui.IViewReference; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; @@ -84,7 +85,7 @@ public abstract class AbstractPerspectiveChecker { @Test public void testPerspectiveForViews() { SWTBotUtils.switchToPerspective(fPerspectiveId); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); for (final String viewID : fViewIds) { List view = fBot.views(new BaseMatcher() { @@ -113,7 +114,7 @@ public abstract class AbstractPerspectiveChecker { @Test public void testPerspectiveComplete() { SWTBotUtils.switchToPerspective(fPerspectiveId); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); for (SWTBotView view : fBot.views()) { assertTrue("view " + view.getViewReference().getId() + " is present", fViewIds.contains(view.getViewReference().getId())); } 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 a1a8018f06..48f24b5c98 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 @@ -75,7 +75,7 @@ import org.eclipse.tracecompass.tmf.ui.project.model.TmfTraceElement; import org.eclipse.tracecompass.tmf.ui.project.model.TmfTraceFolder; import org.eclipse.tracecompass.tmf.ui.project.model.TmfTracesFolder; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.ConditionHelpers.ProjectElementHasChild; -import org.eclipse.tracecompass.tmf.ui.tests.shared.JobUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.eclipse.tracecompass.tmf.ui.views.TracingPerspectiveFactory; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IEditorReference; @@ -93,7 +93,6 @@ import org.hamcrest.Matcher; @SuppressWarnings("restriction") public final class SWTBotUtils { - private static final long MAX_JOBS_WAIT_TIME = 300000; private static final String WINDOW_MENU = "Window"; private static final String PREFERENCES_MENU_ITEM = "Preferences"; private static boolean fPrintedEnvironment = false; @@ -107,13 +106,16 @@ public final class SWTBotUtils { /** * Waits for all Eclipse jobs to finish. Times out after - * SWTBotUtils#MAX_JOBS_WAIT_TIME by default. + * WaitUtils#MAX_JOBS_WAIT_TIME by default. * * @throws RuntimeException * once the waiting time passes the default maximum value + * + * @deprecated Use {@link WaitUtils#waitForJobs()} instead */ + @Deprecated public static void waitForJobs() { - JobUtils.waitForJobs(MAX_JOBS_WAIT_TIME); + WaitUtils.waitForJobs(); } /** @@ -148,7 +150,7 @@ public final class SWTBotUtils { } }); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** @@ -164,16 +166,16 @@ public final class SWTBotUtils { public static void deleteProject(final String projectName, boolean deleteResources, SWTWorkbenchBot bot) { // Wait for any analysis to complete because it might create // supplementary files - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); try { ResourcesPlugin.getWorkspace().getRoot().getProject(projectName).refreshLocal(IResource.DEPTH_INFINITE, null); } catch (CoreException e) { } - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); closeSecondaryShells(bot); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); final SWTBotView projectViewBot = bot.viewById(IPageLayout.ID_PROJECT_EXPLORER); projectViewBot.setFocus(); @@ -194,7 +196,7 @@ public final class SWTBotUtils { bot.waitUntil(Conditions.widgetIsEnabled(okButton)); okButton.click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** @@ -482,7 +484,7 @@ public final class SWTBotUtils { if (delay) { delay(1000); - waitForJobs(); + WaitUtils.waitForJobs(); } } @@ -508,7 +510,7 @@ public final class SWTBotUtils { } }); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.delay(1000); assertNotNull(tmfEd); return editorBot; @@ -744,7 +746,7 @@ public final class SWTBotUtils { if (res[0] != null) { fail(res[0].getMessage()); } - waitForJobs(); + WaitUtils.waitForJobs(); } /** 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 93d8912458..f8755f1b6f 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 @@ -24,6 +24,7 @@ import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences; import org.eclipse.swtbot.swt.finder.waits.DefaultCondition; import org.eclipse.tracecompass.tmf.core.io.BufferedRandomAccessFile; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -57,7 +58,7 @@ public class AbstractCustomParserWizard { SWTBotUtils.switchToTracingPerspective(); /* finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/parsers/custom/TestCustomTxtWizard.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/parsers/custom/TestCustomTxtWizard.java index e933e852e6..aac0e69db2 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/parsers/custom/TestCustomTxtWizard.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/parsers/custom/TestCustomTxtWizard.java @@ -25,6 +25,7 @@ import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; import org.eclipse.swtbot.swt.finder.waits.Conditions; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.junit.Test; import org.junit.runner.RunWith; @@ -136,7 +137,7 @@ public class TestCustomTxtWizard extends AbstractCustomParserWizard { // Set the regular expression for each event line fBot.styledText().setText("12 Hello\nWorld\n23 Goodbye\ncruel world"); eventLine[0].select(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot.textWithLabel("Regular expression:").setText("\\s*(\\d\\d)\\s(.*\\S)"); eventLine[1].select(); fBot.textWithLabel("Regular expression:").setText("([^0-9]*)"); @@ -235,7 +236,7 @@ public class TestCustomTxtWizard extends AbstractCustomParserWizard { assertNotNull(eventLine[1]); fBot.styledText().setText("12 Hello\nWorld\n23 Goodbye\ncruel world"); eventLine[0].select(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot.textWithLabel("Regular expression:").setText("\\s*(\\d\\d)\\s(.*\\S)"); eventLine[1].select(); fBot.textWithLabel("Regular expression:").setText("([^0-9]*)"); 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 7f7ac92a02..bc998cb884 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 @@ -42,6 +42,7 @@ import org.eclipse.tracecompass.tmf.core.tests.TmfCoreTestPlugin; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimePreferencesConstants; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestampFormat; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.eclipse.ui.IEditorReference; import org.hamcrest.Matcher; import org.junit.AfterClass; @@ -124,7 +125,7 @@ public class CallsiteEventsInTableTest { SWTBotUtils.switchToTracingPerspective(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + 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 6a59af119b..5a8aed6292 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 @@ -41,6 +41,7 @@ import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimePreferencesConstants; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestampFormat; 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.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -104,7 +105,7 @@ public class CollapseEventsInTableTest { SWTBotUtils.switchToTracingPerspective(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + 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 944b06ebdc..d9cdfd415c 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 @@ -38,6 +38,7 @@ import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.filter.model.ITmfFilterTreeNode; import org.eclipse.tracecompass.tmf.core.io.BufferedRandomAccessFile; 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.colors.ColorSetting; import org.eclipse.tracecompass.tmf.ui.views.colors.ColorSettingsManager; import org.eclipse.tracecompass.tmf.ui.views.colors.ColorsView; @@ -176,7 +177,7 @@ public class ColorsViewTest { SWTBotUtils.switchToTracingPerspective(); /* finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fFileLocation = File.createTempFile("sample", ".xml"); try (BufferedRandomAccessFile braf = new BufferedRandomAccessFile(fFileLocation, "rw")) { braf.writeBytes(TRACE_START); @@ -254,7 +255,7 @@ public class ColorsViewTest { }); final SWTBotTable eventsEditor = SWTBotUtils.activeEventsEditor(fBot).bot().table(); // should fix race condition of loading the trace - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); eventsEditor.select(2); final SWTBotTableItem tableItem = eventsEditor.getTableItem(2); RGB fgc = UIThreadRunnable.syncExec(new Result() { 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 1972d23980..a0e19884ac 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 @@ -41,6 +41,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTableColumn; import org.eclipse.tracecompass.tmf.core.tests.TmfCoreTestPlugin; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -99,7 +100,7 @@ public class ColumnHeaderMenuTest { SWTBotUtils.switchToTracingPerspective(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.createProject(TRACE_PROJECT_NAME); } 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 59e21aae02..d27ba7cd03 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 @@ -46,6 +46,7 @@ import org.eclipse.swtbot.swt.finder.waits.DefaultCondition; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; import org.eclipse.tracecompass.tmf.core.tests.TmfCoreTestPlugin; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; @@ -113,7 +114,7 @@ public class CopyToClipboardTest { SWTBotUtils.switchToTracingPerspective(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.createProject(TRACE_PROJECT_NAME); } 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 7233b95956..2c604fc945 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 @@ -51,6 +51,7 @@ import org.eclipse.tracecompass.tmf.core.tests.TmfCoreTestPlugin; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.ConditionHelpers; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.ImageHelper; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.eclipse.ui.PlatformUI; import org.junit.After; import org.junit.AfterClass; @@ -125,7 +126,7 @@ public class FilterColorEditorTest { SWTBotUtils.switchToTracingPerspective(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); ColorRegistry colorRegistry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry(); fHighlight = ImageHelper.adjustExpectedColor(colorRegistry.get(HIGHLIGHT_COLOR_DEFINITION_ID).getRGB()); @@ -164,7 +165,7 @@ public class FilterColorEditorTest { @After public void cleanup() { SWTBotUtils.deleteProject(TRACE_PROJECT_NAME, fBot); - SWTBotUtils.waitForJobs(); + 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 de1abc3909..7b67467d88 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 @@ -40,6 +40,7 @@ import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimePreferences; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestampFormat; 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.filter.FilterView; import org.junit.After; import org.junit.AfterClass; @@ -108,7 +109,7 @@ public class FilterViewerTest { SWTBotUtils.switchToTracingPerspective(); /* finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fFileLocation = File.createTempFile("sample", ".xml"); try (BufferedRandomAccessFile braf = new BufferedRandomAccessFile(fFileLocation, "rw")) { braf.writeBytes(TRACE_START); @@ -324,7 +325,7 @@ public class FilterViewerTest { } private static String applyFilter(SWTWorkbenchBot bot, final String filterName) { - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); final SWTBotTable eventsTable = SWTBotUtils.activeEventsEditor(bot).bot().table(); SWTBotTableItem tableItem = eventsTable.getTableItem(2); tableItem.contextMenu(filterName).click(); 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 ee9b033ec7..48929dd9e3 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 @@ -43,6 +43,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.eclipse.tracecompass.tmf.core.tests.TmfCoreTestPlugin; 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.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -98,7 +99,7 @@ public class FontEventEditorTest { SWTBotUtils.switchToTracingPerspective(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + 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 b970db9d26..6e719d5194 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 @@ -39,6 +39,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; import org.eclipse.tracecompass.tmf.core.tests.TmfCoreTestPlugin; import org.eclipse.tracecompass.tmf.ui.editors.TmfTraceColumnManager; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -96,7 +97,7 @@ public class MovableColumnEventsEditorTest { SWTBotUtils.switchToTracingPerspective(); /* Finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + 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 6e0ad5754a..f2befd8e1b 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 @@ -33,6 +33,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotStyledText; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -72,7 +73,7 @@ public class RawTextEditorTest { SWTBotUtils.switchToTracingPerspective(); /* finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** @@ -85,7 +86,7 @@ public class RawTextEditorTest { public void before() throws Exception { SWTBotUtils.createProject(PROJECT_NAME); SWTBotUtils.openTrace(PROJECT_NAME, createTrace(INITIAL_NB_EVENTS), getTraceType()); - SWTBotUtils.waitForJobs(); + 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 dc3caa3efc..3072807752 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 @@ -32,6 +32,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.eclipse.tracecompass.tmf.core.io.BufferedRandomAccessFile; 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.uml2sd.SDView; import org.eclipse.tracecompass.tmf.ui.views.uml2sd.core.Frame; import org.junit.After; @@ -94,7 +95,7 @@ public class SDViewTest { SWTBotUtils.switchToTracingPerspective(); /* finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fFileLocation = File.createTempFile("sample", ".xml"); String eventNames[] = { "test:SEND", "test:RECEIVE" }; String targets[] = { "peer1", "peer2" }; @@ -148,7 +149,7 @@ public class SDViewTest { assertNotNull(viewBot); viewBot.setFocus(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); List viewButtons = viewBot.getToolbarButtons(); List titles = new ArrayList<>(); for (SWTBotToolbarButton buttonBot : viewButtons) { 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 c18d1e55de..c5e844adc9 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 @@ -30,6 +30,7 @@ import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; 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.junit.After; import org.junit.Before; import org.junit.BeforeClass; @@ -72,7 +73,7 @@ public class TestRefreshTextTrace { SWTBotUtils.switchToTracingPerspective(); /* finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /** @@ -84,7 +85,7 @@ public class TestRefreshTextTrace { public void before() throws Exception { SWTBotUtils.createProject(PROJECT_NAME); SWTBotUtils.openTrace(PROJECT_NAME, createTrace(INITIAL_NB_EVENTS), getTraceType()); - SWTBotUtils.waitForJobs(); + 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 fe86406416..661e098d66 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 @@ -42,6 +42,7 @@ import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimePreferences; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestampFormat; 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.junit.After; import org.junit.Before; import org.junit.Test; @@ -98,7 +99,7 @@ public class TestTraceOffsetting { SWTBotUtils.switchToTracingPerspective(); /* finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fLocation = File.createTempFile("sample", ".xml"); try (BufferedRandomAccessFile braf = new BufferedRandomAccessFile(fLocation, "rw")) { braf.writeBytes(TRACE_START); @@ -143,7 +144,7 @@ public class TestTraceOffsetting { SWTBotTreeItem traceItem = SWTBotUtils.getTraceProjectItem(fBot, traceFolderItem, fLocation.getName()); traceItem.select(); traceItem.contextMenu("Apply Time Offset...").click(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); // set offset to 99 ns SWTBotShell shell = fBot.shell("Apply time offset"); shell.setFocus(); @@ -154,7 +155,7 @@ public class TestTraceOffsetting { swtBotTreeItem.pressShortcut(KeyStroke.getInstance('9')); swtBotTreeItem.pressShortcut(KeyStroke.getInstance('9')); swtBotTreeItem.pressShortcut(KeyStroke.getInstance('\n')); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot.button("OK").click(); // wait for trace to close 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 7f47ad28c6..d6213f2e73 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 @@ -36,6 +36,7 @@ import org.eclipse.tracecompass.tmf.core.io.BufferedRandomAccessFile; 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.SWTBotUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.eclipse.tracecompass.tmf.ui.views.callstack.CallStackView; import org.eclipse.tracecompass.tmf.ui.views.histogram.HistogramView; import org.eclipse.tracecompass.tmf.ui.views.timechart.TimeChartView; @@ -108,7 +109,7 @@ public class TmfAlignTimeAxisTest { SWTBotUtils.switchToTracingPerspective(); /* finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fLocation = File.createTempFile("sample", ".xml"); try (BufferedRandomAccessFile braf = new BufferedRandomAccessFile(fLocation, "rw")) { braf.writeBytes(TRACE_START); @@ -227,7 +228,7 @@ public class TmfAlignTimeAxisTest { final int offset = 100; // switch to the proper perspective and wait for views to align SWTBotUtils.switchToPerspective(AlignPerspectiveFactory3.ID); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.delay(SYNC_DELAY); // get views SWTBotView masterView = fBot.viewById(vId1); @@ -237,7 +238,7 @@ public class TmfAlignTimeAxisTest { Point before = slaveSashBot.getPoint(); // move master and wait for slaves to follow drag(masterView, offset); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.delay(SYNC_DELAY); // verify that the slave did not follow assertEquals(before, slaveSashBot.getPoint()); @@ -307,7 +308,7 @@ public class TmfAlignTimeAxisTest { final int offset = 100; final int delta = offset / 2; // wait for the perspective switch to propagate alignments - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.delay(SYNC_DELAY); // select master and slave parts to observe SWTBotView masterViewBot = fBot.viewById(masterView); @@ -323,7 +324,7 @@ public class TmfAlignTimeAxisTest { assertEquals("Approx align", masterOriginalSashX, slaveSashBot.getPoint().x, delta); // move sash and wait for alignment drag(masterViewBot, offset); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); SWTBotUtils.delay(SYNC_DELAY); // check results double masterNewSashX = masterSashBot.getPoint().x; diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/StandardImportGzipTraceTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/StandardImportGzipTraceTest.java index 6dfb8e982c..914f8b33fc 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/StandardImportGzipTraceTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/StandardImportGzipTraceTest.java @@ -51,6 +51,7 @@ import org.eclipse.tracecompass.internal.tmf.ui.project.wizards.importtrace.Mess import org.eclipse.tracecompass.tmf.core.tests.shared.TmfTestTrace; 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.ui.IPageLayout; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchWindow; @@ -165,7 +166,7 @@ public class StandardImportGzipTraceTest { */ SWTBotTreeItem treeItem = SWTBotUtils.getTreeItem(projectExplorer.bot(), tree, PROJECT_NAME, tracesNode, traceName); treeItem.doubleClick(); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); /* * Check results */ @@ -248,6 +249,6 @@ public class StandardImportGzipTraceTest { final SWTBotButton finishButton = fBot.button("Finish"); finishButton.click(); fBot.waitUntil(Conditions.shellCloses(shell)); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } } 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 421023a969..e8f9501b14 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 @@ -35,6 +35,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; @@ -101,7 +102,7 @@ public class TestImportExportPackageWizard { SWTBotUtils.switchToTracingPerspective(); /* finish waiting for eclipse to load */ - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } @@ -125,7 +126,7 @@ public class TestImportExportPackageWizard { assertTrue("Trace :" + f.getAbsolutePath() + " does not exist, aborting test", f.exists()); SWTBotUtils.createProject(PROJECT_NAME); SWTBotUtils.openTrace(PROJECT_NAME, f.getAbsolutePath(), XMLSTUB_ID); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); assertEquals("Incorrect opened trace!", f.getAbsolutePath(), (new File(TmfTraceManager.getInstance().getActiveTrace().getPath())).getAbsolutePath()); SWTBotView projectExplorerBot = fBot.viewByTitle(PROJECT_EXPLORER); assertNotNull("Cannot find " + PROJECT_EXPLORER, projectExplorerBot); @@ -153,7 +154,7 @@ public class TestImportExportPackageWizard { SWTBotShell shell = fBot.activeShell(); shellBot.button(FINISH).click(); // finished exporting - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); fBot.waitUntil(Conditions.shellCloses(shell)); fBot = new SWTWorkbenchBot(); exportPackage = new File(EXPORT_LOCATION); @@ -179,7 +180,7 @@ public class TestImportExportPackageWizard { assertEquals("Test if import matches", f.getName(), TmfTraceManager.getInstance().getActiveTrace().getName()); assertFalse("Test if import files don't match", f.getAbsolutePath().equals(TmfTraceManager.getInstance().getActiveTrace().getPath())); SWTBotUtils.deleteProject(PROJECT_NAME, fBot); - SWTBotUtils.waitForJobs(); + WaitUtils.waitForJobs(); } } diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.tests/shared/org/eclipse/tracecompass/tmf/ui/tests/shared/IWaitCondition.java b/tmf/org.eclipse.tracecompass.tmf.ui.tests/shared/org/eclipse/tracecompass/tmf/ui/tests/shared/IWaitCondition.java new file mode 100644 index 0000000000..980eda9dff --- /dev/null +++ b/tmf/org.eclipse.tracecompass.tmf.ui.tests/shared/org/eclipse/tracecompass/tmf/ui/tests/shared/IWaitCondition.java @@ -0,0 +1,34 @@ +/******************************************************************************* + * Copyright (c) 2008, 2016 Ketan Padegaonkar and others. + * 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: + * Ketan Padegaonkar - initial API and implementation + * Marc-Andre Laperle - Adapted to Trace Compass from SWTBot's TimeoutException + *******************************************************************************/ + +package org.eclipse.tracecompass.tmf.ui.tests.shared; + +/** + * A condition meant to be tested periodically. If it fails after a certain + * timeout, a failure message is provided. + */ +public interface IWaitCondition { + /** + * Tests if the condition has been met. + * + * @return true if the condition is satisfied, false otherwise. + * @throws Exception if the test encounters an error while processing the check. + */ + boolean test() throws Exception; + + /** + * Gets the failure message when a test fails (returns false). + * + * @return the failure message to show in case the test fails. + */ + String getFailureMessage(); +} diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.tests/shared/org/eclipse/tracecompass/tmf/ui/tests/shared/JobUtils.java b/tmf/org.eclipse.tracecompass.tmf.ui.tests/shared/org/eclipse/tracecompass/tmf/ui/tests/shared/JobUtils.java deleted file mode 100644 index 474119fa6d..0000000000 --- a/tmf/org.eclipse.tracecompass.tmf.ui.tests/shared/org/eclipse/tracecompass/tmf/ui/tests/shared/JobUtils.java +++ /dev/null @@ -1,104 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016 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 - *******************************************************************************/ -package org.eclipse.tracecompass.tmf.ui.tests.shared; - -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.swt.widgets.Display; - -/** - * A utility class for Job related things. - */ -public final class JobUtils { - - private JobUtils() { - } - - private static final long SLEEP_INTERVAL_MS = 100; - private static final long UI_THREAD_SLEEP_INTERVAL_MS = 10; - private static final long DEFAULT_MAX_JOBS_WAIT_TIME_MS = 300000; - - /** - * Waits for all Eclipse jobs to finish. Times out after - * RuntimeUtils#MAX_JOBS_WAIT_TIME by default. - * - * @throws RuntimeException - * once the waiting time passes the default maximum value - */ - public static void waitForJobs() { - waitForJobs(DEFAULT_MAX_JOBS_WAIT_TIME_MS); - } - - /** - * Waits for all Eclipse jobs to finish - * - * @param maxWait - * the maximum time to wait, in milliseconds. Once the waiting - * time passes the maximum value, a TimeoutException is thrown - * @throws RuntimeException - * once the waiting time passes the maximum value - */ - public static void waitForJobs(long maxWait) { - long waitStart = System.currentTimeMillis(); - Display display = Display.getCurrent(); - while (!Job.getJobManager().isIdle()) { - if (System.currentTimeMillis() - waitStart > maxWait) { - printJobs(); - throw new RuntimeException("Timed out waiting for jobs to finish."); //$NON-NLS-1$ - } - - if (display != null) { - if (!display.readAndDispatch()) { - // We do not use Display.sleep because it might never wake up - // if there is no user interaction - try { - Thread.sleep(UI_THREAD_SLEEP_INTERVAL_MS); - } catch (final InterruptedException e) { - // Ignored - } - } - display.update(); - } else { - try { - Thread.sleep(SLEEP_INTERVAL_MS); - } catch (final InterruptedException e) { - // Ignored - } - } - } - } - - private static void printJobs() { - Job[] jobs = Job.getJobManager().find(null); - for (Job job : jobs) { - System.err.println(job.toString() + " state: " + jobStateToString(job.getState())); //$NON-NLS-1$ - Thread thread = job.getThread(); - if (thread != null) { - for (StackTraceElement stractTraceElement : thread.getStackTrace()) { - System.err.println(" " + stractTraceElement); //$NON-NLS-1$ - } - } - System.err.println(); - } - } - - private static String jobStateToString(int jobState) { - switch (jobState) { - case Job.RUNNING: - return "RUNNING"; //$NON-NLS-1$ - case Job.WAITING: - return "WAITING"; //$NON-NLS-1$ - case Job.SLEEPING: - return "SLEEPING"; //$NON-NLS-1$ - case Job.NONE: - return "NONE"; //$NON-NLS-1$ - default: - return "UNKNOWN"; //$NON-NLS-1$ - } - } -} diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.tests/shared/org/eclipse/tracecompass/tmf/ui/tests/shared/WaitTimeoutException.java b/tmf/org.eclipse.tracecompass.tmf.ui.tests/shared/org/eclipse/tracecompass/tmf/ui/tests/shared/WaitTimeoutException.java new file mode 100644 index 0000000000..05c71c1406 --- /dev/null +++ b/tmf/org.eclipse.tracecompass.tmf.ui.tests/shared/org/eclipse/tracecompass/tmf/ui/tests/shared/WaitTimeoutException.java @@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2008, 2016 Ketan Padegaonkar and others. + * 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: + * Ketan Padegaonkar - initial API and implementation + * Marc-Andre Laperle - Adapted to Trace Compass from SWTBot's TimeoutException + *******************************************************************************/ + +package org.eclipse.tracecompass.tmf.ui.tests.shared; +/** + * This is an exception that is thrown when a timeout occurs waiting for something (e.g. a condition) to complete. + */ +public class WaitTimeoutException extends RuntimeException { + + private static final long serialVersionUID = -2673174817824776871L; + + /** + * Constructs the exception with the given message. + * + * @param message the message. + */ + public WaitTimeoutException(String message) { + super(message); + } +} diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.tests/shared/org/eclipse/tracecompass/tmf/ui/tests/shared/WaitUtils.java b/tmf/org.eclipse.tracecompass.tmf.ui.tests/shared/org/eclipse/tracecompass/tmf/ui/tests/shared/WaitUtils.java new file mode 100644 index 0000000000..2e477268f9 --- /dev/null +++ b/tmf/org.eclipse.tracecompass.tmf.ui.tests/shared/org/eclipse/tracecompass/tmf/ui/tests/shared/WaitUtils.java @@ -0,0 +1,137 @@ +/******************************************************************************* + * Copyright (c) 2016 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 + *******************************************************************************/ + +package org.eclipse.tracecompass.tmf.ui.tests.shared; + +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.swt.widgets.Display; + +/** + * A utility class for methods related to waiting until certain conditions are met. + */ +public final class WaitUtils { + + private WaitUtils() { + } + + private static final long SLEEP_INTERVAL_MS = 100; + private static final long UI_THREAD_SLEEP_INTERVAL_MS = 10; + private static final long DEFAULT_MAX_WAIT_TIME_MS = 300000; + + /** + * Waits for all Eclipse jobs to finish. + * + * @throws WaitTimeoutException + * once the waiting time passes the maximum value + */ + public static void waitForJobs() { + waitUntil(new IWaitCondition() { + @Override + public boolean test() throws Exception { + return Job.getJobManager().isIdle(); + } + + @Override + public String getFailureMessage() { + printJobs(); + return "Timed out waiting for jobs to finish."; + } + }); + } + + /** + * Prints the state of all the jobs on stderr. + */ + public static void printJobs() { + Job[] jobs = Job.getJobManager().find(null); + for (Job job : jobs) { + System.err.println(job.toString() + " state: " + jobStateToString(job.getState())); //$NON-NLS-1$ + Thread thread = job.getThread(); + if (thread != null) { + for (StackTraceElement stractTraceElement : thread.getStackTrace()) { + System.err.println(" " + stractTraceElement); //$NON-NLS-1$ + } + } + System.err.println(); + } + } + + private static String jobStateToString(int jobState) { + switch (jobState) { + case Job.RUNNING: + return "RUNNING"; //$NON-NLS-1$ + case Job.WAITING: + return "WAITING"; //$NON-NLS-1$ + case Job.SLEEPING: + return "SLEEPING"; //$NON-NLS-1$ + case Job.NONE: + return "NONE"; //$NON-NLS-1$ + default: + return "UNKNOWN"; //$NON-NLS-1$ + } + } + + /** + * Waits for a certain condition to be met. + * + * @param condition + * the condition to be met + * + * @throws WaitTimeoutException + * once the waiting time passes the maximum value + */ + public static void waitUntil(IWaitCondition condition) { + waitUntil(condition, DEFAULT_MAX_WAIT_TIME_MS); + } + + /** + * Waits for a certain condition to be met. + * + * @param condition + * the condition to be met + * @param maxWait + * the maximum time to wait, in milliseconds. Once the waiting + * time passes the maximum value, a WaitTimeoutException is + * thrown + * @throws WaitTimeoutException + * once the waiting time passes the maximum value + */ + public static void waitUntil(IWaitCondition condition, long maxWait) { + long waitStart = System.currentTimeMillis(); + Display display = Display.getCurrent(); + try { + while (!condition.test()) { + if (System.currentTimeMillis() - waitStart > maxWait) { + throw new WaitTimeoutException(condition.getFailureMessage()); //$NON-NLS-1$ + } + + if (display != null) { + if (!display.readAndDispatch()) { + // We do not use Display.sleep because it might never wake up + // if there is no user interaction + try { + Thread.sleep(UI_THREAD_SLEEP_INTERVAL_MS); + } catch (final InterruptedException e) { + // Ignored + } + } + display.update(); + } else { + try { + Thread.sleep(SLEEP_INTERVAL_MS); + } catch (final InterruptedException e) { + // Ignored + } + } + } + } catch (Exception e) { + throw new WaitTimeoutException(condition.getFailureMessage()); //$NON-NLS-1$ + } + } +} diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestFacility.java b/tmf/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestFacility.java index eb30978fd3..1ec91b2a7b 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestFacility.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestFacility.java @@ -34,7 +34,7 @@ import org.eclipse.tracecompass.tmf.core.trace.experiment.TmfExperiment; import org.eclipse.tracecompass.tmf.core.trace.indexer.ITmfTraceIndexer; import org.eclipse.tracecompass.tmf.core.trace.indexer.checkpoint.TmfCheckpointIndexer; import org.eclipse.tracecompass.tmf.tests.stubs.trace.TmfTraceStub; -import org.eclipse.tracecompass.tmf.ui.tests.shared.JobUtils; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils; import org.eclipse.tracecompass.tmf.ui.tests.uml2sd.trace.TmfUml2SDTestTrace; import org.eclipse.tracecompass.tmf.ui.views.uml2sd.SDView; import org.eclipse.tracecompass.tmf.ui.views.uml2sd.dialogs.Criteria; @@ -238,7 +238,7 @@ public class Uml2SDTestFacility { * Waits for all Eclipse jobs to finish */ public void waitForJobs() { - JobUtils.waitForJobs(); + WaitUtils.waitForJobs(); } /**