tmf: Add waitUntil / condition to tmf.ui.tests
authorMarc-Andre Laperle <marc-andre.laperle@ericsson.com>
Wed, 12 Oct 2016 17:00:38 +0000 (13:00 -0400)
committerMarc-Andre Laperle <marc-andre.laperle@ericsson.com>
Wed, 12 Oct 2016 21:29:05 +0000 (17:29 -0400)
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 <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/83051
Reviewed-by: Hudson CI
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>
63 files changed:
analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/META-INF/MANIFEST.MF
analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyDensityViewTest.java
analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyScatterChartViewTest.java
analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyStatisticsTableAnalysisTest.java
analysis/org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/swtbot/tests/latency/SystemCallLatencyTableAnalysisTest.java
ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/META-INF/MANIFEST.MF
ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/AbstractImportAndReadSmokeTest.java
ctf/org.eclipse.tracecompass.tmf.ctf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ctf/ui/swtbot/tests/TestInvalidCtfTrace.java
lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/META-INF/MANIFEST.MF
lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewAllEventsTest.java
lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewExcludeEventsTest.java
lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewKernelFilterTest.java
lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewLoggerTest.java
lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewProfileTest.java
lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewSpecificEventTest.java
lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/control/ui/swtbot/tests/ControlViewTest.java
lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/model/component/TraceControlTestFacility.java
lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/META-INF/MANIFEST.MF
lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java
lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/KernelTestBase.java
lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/OpenTraceStressTest.java
lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ResourcesAndCpuViewTest.java
lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/META-INF/MANIFEST.MF
lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/CallStackViewTest.java
lttng/org.eclipse.tracecompass.lttng2.ust.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/ust/ui/swtbot/tests/MemoryUsageViewTest.java
pcap/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/META-INF/MANIFEST.MF
pcap/org.eclipse.tracecompass.tmf.pcap.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/pcap/ui/swtbot/tests/ImportAndReadPcapTest.java
releng/org.eclipse.tracecompass.integration.swtbot.tests/META-INF/MANIFEST.MF
releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTraceActionsTest.java
releng/org.eclipse.tracecompass.integration.swtbot.tests/src/org/eclipse/tracecompass/integration/swtbot/tests/projectexplorer/ProjectExplorerTracesFolderTest.java
tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/META-INF/MANIFEST.MF
tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternDensityViewTest.java
tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternLatencyTableViewTest.java
tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternLatencyViewTestBase.java
tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/swtbot/tests/latency/PatternScatterChartViewTest.java
tmf/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/META-INF/MANIFEST.MF
tmf/org.eclipse.tracecompass.tmf.remote.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/remote/ui/swtbot/tests/fetch/FetchRemoteTracesTest.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/perf/org/eclipse/tracecompass/tmf/ui/swtbot/tests/perf/views/ViewsResponseTest.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/AbstractPerspectiveChecker.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/shared/org/eclipse/tracecompass/tmf/ui/swtbot/tests/shared/SWTBotUtils.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/parsers/custom/AbstractCustomParserWizard.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/parsers/custom/TestCustomTxtWizard.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/CallsiteEventsInTableTest.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/CollapseEventsInTableTest.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/ColorsViewTest.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/ColumnHeaderMenuTest.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/CopyToClipboardTest.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FilterColorEditorTest.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FilterViewerTest.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/FontEventEditorTest.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/MovableColumnEventsEditorTest.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/RawTextEditorTest.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/SDViewTest.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TestRefreshTextTrace.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TestTraceOffsetting.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/viewers/events/TmfAlignTimeAxisTest.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/StandardImportGzipTraceTest.java
tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/src/org/eclipse/tracecompass/tmf/ui/swtbot/tests/wizards/TestImportExportPackageWizard.java
tmf/org.eclipse.tracecompass.tmf.ui.tests/shared/org/eclipse/tracecompass/tmf/ui/tests/shared/IWaitCondition.java [new file with mode: 0644]
tmf/org.eclipse.tracecompass.tmf.ui.tests/shared/org/eclipse/tracecompass/tmf/ui/tests/shared/JobUtils.java [deleted file]
tmf/org.eclipse.tracecompass.tmf.ui.tests/shared/org/eclipse/tracecompass/tmf/ui/tests/shared/WaitTimeoutException.java [new file with mode: 0644]
tmf/org.eclipse.tracecompass.tmf.ui.tests/shared/org/eclipse/tracecompass/tmf/ui/tests/shared/WaitUtils.java [new file with mode: 0644]
tmf/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestFacility.java

index 14edf821cac9c46d4043422236df3a97226029ad..ea9974e502449ad2450d762e194d456aea02681c 100644 (file)
@@ -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
index 76eaaf3594bc5e1a52510c2ce472638f7a62dd97..3c0787cf43dbcf98548f6270bc6e41359327c4c3 100644 (file)
@@ -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();
index bd8f341606d9298f75ba3355048e775a850ed4d0..b09a719b57f4341d34053f60afbe5f87e34d3c44 100644 (file)
@@ -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);
index 03b6c2827c10253ecb07b5c09fa1410bd650847e..187b733f302535a3d6101765e145d74045d6de0f 100644 (file)
@@ -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
index a5b312f3280fdc70476eb41ec15756fd3e23285c..d755726d66c55c4c48e469492519d32733513001 100644 (file)
@@ -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();
index 1fb54b8fea1fc5e3a886703c48a53529052f405c..6c8376e45e339262bd030f7c45aa237f6769fdf9 100644 (file)
@@ -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,
index 204fef13e81d7dab7484dad7443b88341114f49d..22b52fd0251da37de2c047b927a472360e5f4aba 100644 (file)
@@ -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);
     }
index a6888ccc1adbf52a3fbaa5405090feb519b0bd2d..192cda95a7838834dd165ae56aebd48ff8d5500d 100644 (file)
@@ -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);
 
     }
index aa0c8dd6b8355e56adf42346b2d251452b53ad12..e407275c8a456fdc077a4970ce48e0da0ddbff3e 100644 (file)
@@ -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"
index 95fa5bb75d31fae367ec175eb99d40fa34bff3a5..3e604a5d91be061d8a2add07b63b6e5a23cdb015 100644 (file)
@@ -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));
 
index 71296a1e4e2785280dce1808b84dc8852a9c7c09..6b145404293c14f9d21608375197987d5c21ab10 100644 (file)
@@ -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));
 
index b78b17b92072f15913e1ca8771bfdacbac2e3ae5..697854e524a01fbdbe586c4948218b0852713d44 100644 (file)
@@ -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(),
index 43e623c67cb519865eedac849a3b65612dd45603..2844f87d65dbede84c3c78efb4854497a6ad1a36 100644 (file)
@@ -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
index f7db9d003de91a281340d79860cf08730c93f4cb..86d6d2b093b81ddd23e5249182180cc44dc8ee43 100644 (file)
@@ -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);
index 6f0e251d5505d068b335dc9f1c921421a8d531ed..ddd4056793eac8364fd03bc629575f20f35c840e 100644 (file)
@@ -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));
index 8343f953748233aebf04dc32e0441ad5556d8537..f5c6aefe821a4e5db1cdd6264e7819c4fba8039b 100644 (file)
@@ -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) {
index 7b6e5ebeaaec13eefb6ad4b02f384db1df89de42..ead506ca01dc4a987ca9fbddf689a59299e25170 100644 (file)
@@ -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 {
index 52675b72e2f48e3d4e47915e55837d544dec2fda..0fc2af715766ec8f03f8acdd15c46fe3c9161343 100644 (file)
@@ -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"
index 48b606c8241fc9a2891b75775963fe02e4a026a7..8ebf6e0c971c5b09ba6b65043787a06808b60c48 100644 (file)
@@ -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);
     }
index 2c826f782894e87b8aca62d88567314c930fd39a..73edaff79b2e766d5c18fe6d6c9b4d64003a3b35 100644 (file)
@@ -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();
     }
 
     /**
index 14102c228081e06f262c48f93b414b80bcfef426..a2255219b9e86faf975e9db250a93c428f63ac30 100644 (file)
@@ -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();
     }
 
     /**
index 28dcc424da1eaf35100077c08b39d5753b16d82a..b87086e53cfa2fed8e19d495e92a4b3a5acf0cc8 100644 (file)
@@ -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() {
index 60e24b63a5d4430a82383951c56fea0cb8df4739..5a059032ce869698d7dcea392d98e06769cd49ea 100644 (file)
@@ -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"
index 1bbad5616128554e9a3f5c522cd18d2beee1a782..25f7d5f00ff0f86108b644c0c0e844512cfc258d 100644 (file)
@@ -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<String> 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<String> 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<String> names = new ArrayList<>();
         for (SWTBotTreeItem swtBotTreeItem : tree.getAllItems()) {
             for (SWTBotTreeItem items : swtBotTreeItem.getItems()) {
index d74b68103b8325427fac6ebce9d469ee92ade922..fcd1320cdb1cc19188a76ea3d07e1124c994a9aa 100644 (file)
@@ -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();
     }
 
     /**
index 00581311581fd80b532fb1a2fc7c206f0070a5bf..678f7fed89f6b110911cffbde6daee541595c7a8 100644 (file)
@@ -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
index 28e9eac2bef3b3c8f8983b740bfbff5dbec6ff66..227a6dc9fbc234c956c9e7dffd93d6f9e644057c 100644 (file)
@@ -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);
     }
index 78c92b873770ed1a77d28827c376bc26f35c0fb0..bea8fffa66aef2195a1cdc10c0dcfd2ae75426c7 100644 (file)
@@ -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"
index a35085cc7fb42f2f5152c8c09aea6f4eece1b5c3..675d0a5795c6c10802665031004dfde4786fe0fd 100644 (file)
@@ -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);
     }
 
index a41bb906b0be900d3e80b57b23c3194c74c43cfd..050947dd3376d4aee7eb8f2126d68c2ab52091ab 100644 (file)
@@ -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);
     }
 
index 127c1aa1f726bcba50ddd3f35e00f20f47891108..fcee0a678d1d315df5bb2039e5f54651031dc3e5 100644 (file)
@@ -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
index 626d8516963da6f24c629ec5bcf704577007da8f..491b863ad692be62e4b420d557704d14b0d116ef 100644 (file)
@@ -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());
index c1bbd1e644533dff363ae42e652c26f4e7cf9c01..690b17a8b522c083bceac8bba8ff1e982c5cbb5d 100644 (file)
@@ -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());
index 77abea0c0eaa1f1a4e741e19d9ba33d14e579027..2d851b5076e3a38b96ef6f43f844e554b833932e 100644 (file)
@@ -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.");
         }
index 2fd21b944ae4e9dd48d8b73aa95d89cd06c691dd..499683255206de11f1f0712347ca3783fd5fa2a1 100644 (file)
@@ -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));
index 461414e0b0f35086794427734ae292f4884dac15..a6f3985e93c1df5173672e6c188e79182dbfce31 100644 (file)
@@ -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,
index 7e6654bf0dd4a3d8bb296cdfaf6baf5ddf7a423e..6b66637ffa88ebaa31bc4115454b5b5ad4881452 100644 (file)
@@ -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();
index 3f839491a2bed5c3c3fed1b03f273b96e75f2ff5..ed6d377b3c724a079827c636395dff88f9d0504b 100644 (file)
@@ -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
index 288606c4f05302b213fe13040ec257b0de11a783..50375a0226f336bc292e69de4ae580c3970c69af 100644 (file)
@@ -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<SWTBotView> view = fBot.views(new BaseMatcher<String>() {
 
@@ -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()));
         }
index a1a8018f06c8356ab78805c42b5bc159d4aa0270..48f24b5c9824a0491d0f5e7eac01b871fb2ad7de 100644 (file)
@@ -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();
     }
 
     /**
index 93d8912458c74f808d6173579a665784b98840a3..f8755f1b6f67ea877d5b58afc754d68a347a0a95 100644 (file)
@@ -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();
     }
 
     /**
index e933e852e677e45d8de0a5dce8003a880508a467..aac0e69db25618a361313a9a7e889596f10a8100 100644 (file)
@@ -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]*)");
index 7f7ac92a02b1a940d6606101fda9b96fe21bed7f..bc998cb8848a239171fabb74f09048927d08b10a 100644 (file)
@@ -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();
     }
 
     /**
index 6a59af119bcb660642fd3119b8386daafad9a3aa..5a8aed6292c9053ec03944e467362e7b71720172 100644 (file)
@@ -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();
     }
 
     /**
index 944b06ebdcbcf067602f3c4e17f85c754222877e..d9cdfd415cdcc48090f3426f01022db2c187ebc6 100644 (file)
@@ -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<RGB>() {
index 1972d2398058b3b2d34b669fb38b7ef7b78dcb18..a0e19884ac466419a9fc31d88bfcf9cfe4d90fdc 100644 (file)
@@ -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);
     }
index 59e21aae021263c5a36de4656281529ff53722a2..d27ba7cd0345645eb3b50edef6e28fea23add243 100644 (file)
@@ -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);
     }
index 7233b9595680492df8d17950fac1a2c2fa81a030..2c604fc945d74ff04e5c7b68a2e7c636e89b75ad 100644 (file)
@@ -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();
     }
 
     /**
index de1abc3909edf78fa7f276a14417d7f98f761cb5..7b67467d8827009890c5caaa2cab6cb67925a3ad 100644 (file)
@@ -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();
index ee9b033ec78bdb407cffa71aed037184f112a1bf..48929dd9e31d65fc8dc3a04a03bed92f3b6b24e6 100644 (file)
@@ -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();
     }
 
     /**
index b970db9d26df329c2d1ab316e4956495c1ffad1c..6e719d5194c2f28fee4dc09755b333f8617fe714 100644 (file)
@@ -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();
     }
 
     /**
index 6e0ad5754a6631aa7148d572d9d66366d777c91d..f2befd8e1bc96e8e5b763c2c6242b16acf1e927d 100644 (file)
@@ -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();
     }
 
     /**
index dc3caa3efcd2b20a54775b2d6a7eb880e3c32bc1..30728077529d52bb7461e5df5e7b056ad64d7143 100644 (file)
@@ -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<SWTBotToolbarButton> viewButtons = viewBot.getToolbarButtons();
         List<String> titles = new ArrayList<>();
         for (SWTBotToolbarButton buttonBot : viewButtons) {
index c18d1e55de50e631ae98f73f6213a6a02393b939..c5e844adc966296e822142c494e60c3821c60bcd 100644 (file)
@@ -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();
     }
 
     /**
index fe8640641670eeaad28f5d71935eb2d0578460e7..661e098d66c815031ddc7e39021692acce69d87a 100644 (file)
@@ -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
index 7f47ad28c62d0e5bd4b9b98f74a43e667fa8d8d7..d6213f2e73a0c77ffd89b128aa2c3b5110acd3d8 100644 (file)
@@ -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;
index 6dfb8e982c89a4c4976033302512157b59fd3131..914f8b33fc01d4322cef0f346d79ec94f2dac1c8 100644 (file)
@@ -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();
     }
 }
index 421023a969fb15baa9a08e728b90332dc58be6c9..e8f9501b1404c8e1415891be40470324173bca5c 100644 (file)
@@ -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 (file)
index 0000000..980eda9
--- /dev/null
@@ -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 <code>true</code> if the condition is satisfied, <code>false</code> 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 <code>false</code>).
+     *
+     * @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 (file)
index 474119f..0000000
+++ /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 (file)
index 0000000..05c71c1
--- /dev/null
@@ -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 (file)
index 0000000..2e47726
--- /dev/null
@@ -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$
+        }
+    }
+}
index eb30978fd3255da84071a314d2d7d0591dc40ae7..1ec91b2a7b00e217972c3a9684c43bad4b3e1edb 100644 (file)
@@ -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();
     }
 
     /**
This page took 0.108518 seconds and 5 git commands to generate.