Author: mareshkau Date: 2010-02-15 11:49:26 -0500 (Mon, 15 Feb 2010) New Revision: 20281 Modified: branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentTest.java branches/jbosstools-3.1.0.RC2/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java branches/jbosstools-3.1.0.RC2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-5820 https://jira.jboss.org/jira/browse/JBIDE-5821 Modified: branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java =================================================================== --- branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java 2010-02-15 14:41:13 UTC (rev 20280) +++ branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesComponentTest.java 2010-02-15 16:49:26 UTC (rev 20281) @@ -203,12 +203,8 @@ performTestForVpeComponent((IFile) TestUtil.getComponentPath( "components/componentControl.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } - /** - * Commented by Maksim Areshkau as workaround for https://jira.jboss.org/jira/browse/JBIDE-5821 - * - * @throws Throwable - */ - public void _testContextMenu() throws Throwable { + + public void testContextMenu() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( "components/contextMenu.xhtml", RichFacesAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } Modified: branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentTest.java =================================================================== --- branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentTest.java 2010-02-15 14:41:13 UTC (rev 20280) +++ branches/jbosstools-3.1.0.RC2/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/src/org/jboss/tools/jsf/vpe/seam/test/SeamComponentTest.java 2010-02-15 16:49:26 UTC (rev 20281) @@ -26,12 +26,8 @@ super(name); setCheckWarning(false); } - /** - * Commented by Maksim Areshkau, because possible concurent modification exception - * see https://jira.jboss.org/jira/browse/JBIDE-5820 - * @throws Throwable - */ - public void _testButton() throws Throwable { + + public void testButton() throws Throwable { performTestForVpeComponent((IFile) TestUtil.getComponentPath( "components/button.xhtml", SeamAllTests.IMPORT_PROJECT_NAME)); //$NON-NLS-1$ } Modified: branches/jbosstools-3.1.0.RC2/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java =================================================================== --- branches/jbosstools-3.1.0.RC2/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2010-02-15 14:41:13 UTC (rev 20280) +++ branches/jbosstools-3.1.0.RC2/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/ResourcesUtils.java 2010-02-15 16:49:26 UTC (rev 20281) @@ -18,7 +18,6 @@ import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; - import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -188,7 +187,7 @@ // importProjectIntoWorkspace(bean); //} - private static final long IMPORT_DELAY = 50; + private static final long IMPORT_DELAY = 1000; /** * Import project into workspace. @@ -232,9 +231,9 @@ .getActiveWorkbenchWindow().getShell()); // run import importOp.run(null); - JobUtils.waitForIdle(IMPORT_DELAY); ResourcesUtils.setBuildAutomatically(state); - + + JobUtils.waitForIdle(IMPORT_DELAY); } catch (InvocationTargetException ite) { // TePlugin.getDefault().logError(ite.getCause()); ite.printStackTrace(); Modified: branches/jbosstools-3.1.0.RC2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java =================================================================== --- branches/jbosstools-3.1.0.RC2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2010-02-15 14:41:13 UTC (rev 20280) +++ branches/jbosstools-3.1.0.RC2/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2010-02-15 16:49:26 UTC (rev 20281) @@ -190,8 +190,13 @@ * Wait until all background tasks are complete. */ public static void waitForJobs() { - while (Job.getJobManager().currentJob() != null) - delay(100); + //commented by Maksim Areshkau + //because this method wait only for jobs which has been runned in current thread, + //and don't wait for others. It can cause https://jira.jboss.org/jira/browse/JBIDE-5820 + //https://jira.jboss.org/jira/browse/JBIDE-5821 +// while (Job.getJobManager().currentJob() != null) +// delay(100); + waitForIdle(); } /**