Author: dgolovin Date: 2008-11-05 18:02:08 -0500 (Wed, 05 Nov 2008) New Revision: 11546 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamBigProjectTest.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java Log: fix for Seam Validation Test Errors Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamBigProjectTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamBigProjectTest.java 2008-11-05 20:18:16 UTC (rev 11545) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamBigProjectTest.java 2008-11-05 23:02:08 UTC (rev 11546) @@ -165,7 +165,7 @@ // ResourcesUtils.setBuildAutomatically(save); - assertTrue("Validator takes more than 5s (" + ((dt-500)/1000d) + ") for validating generated long.xhtml", dt < 5000); + assertTrue("Validator takes more than 5s (" + ((dt-500)/1000d) + ") for validating generated long.xhtml", ((dt-500)/1000d) < 5); } catch (CoreException e) { JUnitUtils.fail("", e); } Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-11-05 20:18:16 UTC (rev 11545) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-11-05 23:02:08 UTC (rev 11546) @@ -837,9 +837,7 @@ try { project.refreshLocal(IResource.DEPTH_INFINITE, null); JobUtils.waitForIdle(); -// project.build(IncrementalProjectBuilder.CLEAN_BUILD, null); -// JobUtils.waitForIdle(); - JobUtils.delay(5000); + JobUtils.delay(2000); } catch (CoreException e) { // ignore } Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2008-11-05 20:18:16 UTC (rev 11545) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2008-11-05 23:02:08 UTC (rev 11546) @@ -53,8 +53,8 @@ public IProject[] importProjects() throws Exception { IProject[] projects = new IProject[projectPaths.length]; + JobUtils.waitForIdle(); for (int i = 0; i < projectPaths.length; i++) { - JobUtils.waitForIdle(); projects[i] = (IProject)ResourcesUtils.importProject(bundleName, projectPaths[i]); JobUtils.waitForIdle(); } Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java 2008-11-05 20:18:16 UTC (rev 11545) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java 2008-11-05 23:02:08 UTC (rev 11546) @@ -187,33 +187,34 @@ project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); project.create(null); project.open(null); + JobUtils.waitForIdle(); + IOverwriteQuery overwrite = new IOverwriteQuery() { public String queryOverwrite(String pathString) { return ALL; } }; - + ImportProvider importProvider = new ImportProvider(); - + // need to remove from imported project "svn" files List<String> unimportedFiles = new ArrayList<String>(); unimportedFiles.add(".svn"); //$NON-NLS-1$ - + importProvider.setUnimportedFiles(unimportedFiles); - + // create import operation ImportOperation importOp = new ImportOperation(project .getFullPath(), new File(path), importProvider, overwrite); - + // import files just to project folder ( without old structure ) importOp.setCreateContainerStructure(false); - + importOp.setContext(PlatformUI.getWorkbench() .getActiveWorkbenchWindow().getShell()); - // run import importOp.run(null); - + } catch (InvocationTargetException ite) { // TePlugin.getDefault().logError(ite.getCause()); } catch (InterruptedException ie) {