Author: dgolovin Date: 2011-09-14 20:56:50 -0400 (Wed, 14 Sep 2011) New Revision: 34750 Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java Log: Added methods to import project without waiting for JobManager is idle. It can be used when test requires only project structure and files content. Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2011-09-15 00:19:48 UTC (rev 34749) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2011-09-15 00:56:50 UTC (rev 34750) @@ -67,12 +67,24 @@ throws IOException, CoreException, InvocationTargetException, InterruptedException { + return importProject( + bundle, templLocation, projectName, + monitor,false); + + } + + public static IProject importProject( + Bundle bundle, String templLocation, String projectName, + IProgressMonitor monitor, boolean skipWaitForIdle) + throws + IOException, CoreException, + InvocationTargetException, InterruptedException { String tplPrjLcStr; tplPrjLcStr = FileLocator.resolve(bundle.getEntry(templLocation)) .getFile(); String protocol = FileLocator.resolve(bundle.getEntry(templLocation)).getProtocol(); - IProject importedPrj = importProjectIntoWorkspace(tplPrjLcStr, projectName, protocol); + IProject importedPrj = importProjectIntoWorkspace(tplPrjLcStr, projectName, protocol,skipWaitForIdle); return importedPrj; } @@ -227,16 +239,12 @@ return oldAutoBuilding; } - //static public void importProjectIntoWorkspace(ImportBean bean) { - // importProjectIntoWorkspace(bean); - //} - private static final long IMPORT_DELAY = 200; static public IProject importProjectIntoWorkspace(String path, String projectName) { return importProjectIntoWorkspace(path, projectName,"file"); } - + /** * Import project into workspace. * @@ -245,7 +253,18 @@ * @param protocol */ static public IProject importProjectIntoWorkspace(String path, String projectName, String protocol) { + return importProjectIntoWorkspace(path, projectName, protocol, false); + } + /** + * Import project into workspace. + * + * @param path the path + * @param projectName the project name + * @param protocol + */ + static public IProject importProjectIntoWorkspace(String path, String projectName, String protocol, boolean skipWaitForIdle) { + IProject project = null; try { @@ -303,8 +322,9 @@ importOp.run(null); project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); ResourcesUtils.setBuildAutomatically(state); - - JobUtils.waitForIdle(IMPORT_DELAY); + if(!skipWaitForIdle) { + JobUtils.waitForIdle(IMPORT_DELAY); + } } catch (InvocationTargetException ite) { // TePlugin.getDefault().logError(ite.getCause()); ite.printStackTrace();