Author: akazakov Date: 2011-08-09 14:04:28 -0400 (Tue, 09 Aug 2011) New Revision: 33727 Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java Log: https://issues.jboss.org/browse/JBIDE-9394 Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java 2011-08-09 17:41:34 UTC (rev 33726) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamConfigValidationTest.java 2011-08-09 18:04:28 UTC (rev 33727) @@ -16,19 +16,15 @@ import org.eclipse.core.internal.preferences.EclipsePreferences; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.seam.config.core.CDISeamConfigPreferences; import org.jboss.tools.cdi.seam.config.core.validation.SeamConfigValidationMessages; import org.jboss.tools.common.preferences.SeverityPreferences; -import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.test.util.ResourcesUtils; import org.jboss.tools.tests.AbstractResourceMarkerTest; @@ -59,6 +55,7 @@ project = findTestProject(); if(project==null || !project.exists()) { project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH); + TestUtil._waitForValidation(project); } } catch (Exception e) { e.printStackTrace(); @@ -85,7 +82,7 @@ public void testMethodResolution() throws CoreException { //It is unresolved member because no member with that name is found. AbstractResourceMarkerTest.assertMarkerIsCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_MEMBER, "v:method2"), 38); - + AbstractResourceMarkerTest.assertMarkerIsNotCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_MEMBER, "v:method1"), 34); AbstractResourceMarkerTest.assertMarkerIsNotCreated(f, MessageFormat.format(SeamConfigValidationMessages.UNRESOLVED_METHOD, "v:method1"), 34); @@ -115,21 +112,13 @@ EclipsePreferences ps = (EclipsePreferences)CDISeamConfigPreferences.getInstance().getDefaultPreferences(); ps.put(CDISeamConfigPreferences.UNRESOLVED_MEMBER, SeverityPreferences.IGNORE); - rebuild(); + TestUtil._waitForValidation(project); AbstractResourceMarkerTest.assertMarkerIsCreated(f, pattern1, 47); AbstractResourceMarkerTest.assertMarkerIsNotCreated(f, pattern2, 38); ps.put(CDISeamConfigPreferences.UNRESOLVED_MEMBER, SeverityPreferences.WARNING); - rebuild(); + TestUtil._waitForValidation(project); AbstractResourceMarkerTest.assertMarkerIsCreated(f, pattern1, 47); AbstractResourceMarkerTest.assertMarkerIsCreated(f, pattern2, 38); } - - void rebuild() throws CoreException { - project.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor()); - JobUtils.waitForIdle(); - project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); - JobUtils.waitForIdle(); - } - } \ No newline at end of file