Author: scabanovich Date: 2011-06-03 14:17:33 -0400 (Fri, 03 Jun 2011) New Revision: 31821 Modified: trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/CATestUtil.java Log: JBIDE-9066 https://issues.jboss.org/browse/JBIDE-9066 Modified: trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/CATestUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/CATestUtil.java 2011-06-03 17:55:48 UTC (rev 31820) +++ trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/contentassist/CATestUtil.java 2011-06-03 18:17:33 UTC (rev 31821) @@ -31,6 +31,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.texteditor.ITextEditor; import org.jboss.tools.common.text.xml.contentassist.ProposalSorter; +import org.jboss.tools.test.util.JobUtils; public class CATestUtil { @@ -64,38 +65,14 @@ * the number of milliseconds */ public static void delay(long waitTimeMillis) { - Display display = Display.getCurrent(); - - // If this is the UI thread, - // then process input. - if (display != null) { - long endTimeMillis = System.currentTimeMillis() + waitTimeMillis; - while (System.currentTimeMillis() < endTimeMillis) { - if (!display.readAndDispatch()) - display.sleep(); - } - display.update(); - } - // Otherwise, perform a simple sleep. - else { - try { - Thread.sleep(waitTimeMillis); - } catch (InterruptedException e) { - // Ignored. - } - } + JobUtils.delay(waitTimeMillis); } /** * Wait for idle. */ public static void waitForIdle(long maxIdle) { - long start = System.currentTimeMillis(); - while (!Job.getJobManager().isIdle()) { - delay(500); - if ( (System.currentTimeMillis()-start) > maxIdle ) - throw new RuntimeException("A long running task detected"); //$NON-NLS-1$ - } + JobUtils.waitForIdle(500, maxIdle); } public static SourceViewerConfiguration getSourceViewerConfiguration(ITextEditor editor) {