Author: akazakov Date: 2011-08-09 16:15:03 -0400 (Tue, 09 Aug 2011) New Revision: 33735 Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamCoreTestSetup.java trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamResourceBundlesTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/servlet/SeamServletValidationTest.java Log: https://issues.jboss.org/browse/JBIDE-9394 Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java 2011-08-09 19:38:32 UTC (rev 33734) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java 2011-08-09 20:15:03 UTC (rev 33735) @@ -35,12 +35,12 @@ suiteAll.addTestSuite(BundleModelTest.class); TestSuite suite = new TestSuite("Seam Core Project Tests"); + suite.addTestSuite(SeamServletValidationTest.class); suiteAll.addTest(new SeamCoreTestSetup(suite)); - suiteAll.addTestSuite(SeamServletValidationTest.class); - + suite = new TestSuite("Seam Persistence Project Tests"); + suite.addTestSuite(SeamPersistenceTest.class); suiteAll.addTest(new SeamPersistenceTestSetup(suite)); - suiteAll.addTestSuite(SeamPersistenceTest.class); return suiteAll; } } \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamCoreTestSetup.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamCoreTestSetup.java 2011-08-09 19:38:32 UTC (rev 33734) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/SeamCoreTestSetup.java 2011-08-09 20:15:03 UTC (rev 33735) @@ -15,6 +15,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; +import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; @@ -38,13 +39,13 @@ project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME); if(!project.exists()) { project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH); + TestUtil._waitForValidation(project); } } @Override protected void tearDown() throws Exception { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); project.delete(true, true, null); JobUtils.waitForIdle(); ResourcesUtils.setBuildAutomatically(saveAutoBuild); Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamResourceBundlesTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamResourceBundlesTest.java 2011-08-09 19:38:32 UTC (rev 33734) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/international/SeamResourceBundlesTest.java 2011-08-09 20:15:03 UTC (rev 33735) @@ -15,10 +15,7 @@ import java.util.List; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Platform; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.test.tck.TCKTest; @@ -38,8 +35,6 @@ import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil.TestHyperlink; import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil.TestRegion; import org.jboss.tools.jst.web.kb.PageContextFactory; -import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager; -import org.jboss.tools.test.util.JobUtils; import org.osgi.framework.Bundle; /** @@ -202,13 +197,7 @@ if (!FileUtil.copyFile(seamInternationalPageFrom, seamInternationalPageTo)) return false; - ValidatorManager.setStatus(ValidatorManager.RUNNING); - tckProject.refreshLocal(IResource.DEPTH_INFINITE, null); - JobUtils.waitForIdle(); - tckProject.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor()); - JobUtils.waitForIdle(); - tckProject.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); - TestUtil.waitForValidation(); + TestUtil.validate(tckProject); caTest.setProject(tckProject); return true; Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java 2011-08-09 19:38:32 UTC (rev 33734) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java 2011-08-09 20:15:03 UTC (rev 33735) @@ -15,7 +15,6 @@ import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.test.DependentProjectTest; import org.jboss.tools.jst.jsp.test.TestUtil; -import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager; import org.jboss.tools.test.util.ResourcesUtils; public class SeamPersistenceTest extends TestCase { @@ -24,12 +23,11 @@ public IProject getTestProject() throws IOException, CoreException, InvocationTargetException, InterruptedException { if(project==null) { - ValidatorManager.setStatus("INIT"); project = ResourcesPlugin.getWorkspace().getRoot().getProject(SeamPersistenceTestSetup.PROJECT_NAME); if(!project.exists()) { project = ResourcesUtils.importProject(SeamPersistenceTestSetup.PLUGIN_ID, SeamPersistenceTestSetup.PROJECT_PATH); + TestUtil.waitForValidation(); } - TestUtil.waitForValidation(); } return project; } @@ -51,5 +49,4 @@ Set<IBean> bs = cdi.getBeans(false, p); assertFalse(bs.isEmpty()); } - -} +} \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java 2011-08-09 19:38:32 UTC (rev 33734) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java 2011-08-09 20:15:03 UTC (rev 33735) @@ -14,6 +14,7 @@ import junit.framework.Test; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.ResourcesPlugin; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; @@ -38,13 +39,13 @@ project = ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME); if(!project.exists()) { project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH); + project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); } } @Override protected void tearDown() throws Exception { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); project.delete(true, true, null); JobUtils.waitForIdle(); ResourcesUtils.setBuildAutomatically(saveAutoBuild); Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/servlet/SeamServletValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/servlet/SeamServletValidationTest.java 2011-08-09 19:38:32 UTC (rev 33734) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/servlet/SeamServletValidationTest.java 2011-08-09 20:15:03 UTC (rev 33735) @@ -22,7 +22,6 @@ import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages; import org.jboss.tools.cdi.seam.core.test.SeamCoreTestSetup; import org.jboss.tools.jst.jsp.test.TestUtil; -import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager; import org.jboss.tools.test.util.ResourcesUtils; import org.jboss.tools.tests.AbstractResourceMarkerTest; @@ -35,12 +34,11 @@ public IProject getTestProject() throws IOException, CoreException, InvocationTargetException, InterruptedException { if(project==null) { - ValidatorManager.setStatus("INIT"); project = ResourcesPlugin.getWorkspace().getRoot().getProject(SeamCoreTestSetup.PROJECT_NAME); if(!project.exists()) { project = ResourcesUtils.importProject(SeamCoreTestSetup.PLUGIN_ID, SeamCoreTestSetup.PROJECT_PATH); + TestUtil.waitForValidation(); } - TestUtil.waitForValidation(); } return project; }