Author: akazakov Date: 2011-08-08 21:50:39 -0400 (Mon, 08 Aug 2011) New Revision: 33711 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/RemoveJarFromClasspathTest.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BuilderOrderValidationTest.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELValidationTest.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ContextValidationHelper.java Log: https://issues.jboss.org/browse/JBIDE-9394 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-08-09 00:34:11 UTC (rev 33710) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-08-09 01:50:39 UTC (rev 33711) @@ -119,7 +119,7 @@ ICDIProject result = definition.getDeclaringProject().getDelegate(); if(result == null) { result = getCDIProject(); - System.out.println("Failed to get declaring project."); +// System.out.println("Failed to get declaring project."); } return result; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java 2011-08-09 00:34:11 UTC (rev 33710) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java 2011-08-09 01:50:39 UTC (rev 33711) @@ -31,9 +31,6 @@ } public void setDefinition(ParameterDefinition definition) { - if(beanMethod.getMethod().getElementName().equals("obs")) { - System.out.println("!!"); - } super.setDefinition(definition); this.definition = definition; } Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/RemoveJarFromClasspathTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/RemoveJarFromClasspathTest.java 2011-08-09 00:34:11 UTC (rev 33710) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/RemoveJarFromClasspathTest.java 2011-08-09 01:50:39 UTC (rev 33711) @@ -7,7 +7,6 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; @@ -19,7 +18,6 @@ import org.jboss.tools.common.model.filesystems.FileSystemsHelper; import org.jboss.tools.common.model.filesystems.impl.Libs; import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; @@ -37,9 +35,7 @@ public void setUp() throws Exception { project = ResourcesUtils.importProject(PLUGIN_ID, "/projects/RemoveJarTest"); - JobUtils.waitForIdle(); - project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - JobUtils.waitForIdle(); + project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null); } /** @@ -95,7 +91,6 @@ */ public static void replaceFile(IProject project, String sourcePath, String targetPath) throws CoreException { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); try { IFile target = project.getFile(new Path(targetPath)); IFile source = project.getFile(new Path(sourcePath)); @@ -106,10 +101,7 @@ } else { target.setContents(source.getContents(), true, false, new NullProgressMonitor()); } - JobUtils.waitForIdle(); project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); - JobUtils.waitForIdle(); - TestUtil.waitForValidation(); } finally { ResourcesUtils.setBuildAutomatically(saveAutoBuild); JobUtils.waitForIdle(); @@ -118,9 +110,7 @@ public void tearDown() throws Exception { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); project.delete(true, true, null); - JobUtils.waitForIdle(); ResourcesUtils.setBuildAutomatically(saveAutoBuild); JobUtils.waitForIdle(); } Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BuilderOrderValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BuilderOrderValidationTest.java 2011-08-09 00:34:11 UTC (rev 33710) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/BuilderOrderValidationTest.java 2011-08-09 01:50:39 UTC (rev 33711) @@ -16,10 +16,8 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; -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.ui.IMarkerResolution; import org.eclipse.ui.ide.IDE; import org.jboss.tools.cdi.core.preferences.CDIPreferences; @@ -27,7 +25,6 @@ import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager; import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences; -import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; public class BuilderOrderValidationTest extends TestCase { @@ -39,7 +36,7 @@ project = ResourcesPlugin.getWorkspace().getRoot().getProject("CDITestBrokenBuilderOrder"); assertNotNull("Can't load CDITestBrokenBuilderOrder", project); //$NON-NLS-1$ saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - rebuild(); + TestUtil._waitForValidation(project); } public void tearDown() throws CoreException { @@ -47,29 +44,23 @@ } private void checkResolution(IProject project, String markerType, String resolutionClassName) throws CoreException { - try{ - IMarker[] markers = getBuilderOrderMarkers(); - assertTrue(markers.length > 0); - for (int i = 0; i < markers.length; i++) { - IMarker marker = markers[i]; - IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry().getResolutions(marker); - for (int j = 0; j < resolutions.length; j++) { - IMarkerResolution resolution = resolutions[j]; - if (resolution.getClass().getName().equals(resolutionClassName)) { - ValidatorManager.setStatus(ValidatorManager.RUNNING); - resolution.run(marker); - JobUtils.waitForIdle(); - TestUtil.waitForValidation(); - IMarker[] newMarkers = project.findMarkers(markerType, true, IResource.DEPTH_INFINITE); - assertTrue("Marker resolution did not decrease number of problems. was: "+markers.length+" now: "+newMarkers.length, newMarkers.length < markers.length); - return; - } - fail("Marker resolution: "+resolutionClassName+" not found"); + IMarker[] markers = getBuilderOrderMarkers(); + assertTrue(markers.length > 0); + for (int i = 0; i < markers.length; i++) { + IMarker marker = markers[i]; + IMarkerResolution[] resolutions = IDE.getMarkerHelpRegistry().getResolutions(marker); + for (int j = 0; j < resolutions.length; j++) { + IMarkerResolution resolution = resolutions[j]; + if (resolution.getClass().getName().equals(resolutionClassName)) { + ValidatorManager.setStatus(ValidatorManager.RUNNING); + resolution.run(marker); + TestUtil._waitForValidation(project); + IMarker[] newMarkers = project.findMarkers(markerType, true, IResource.DEPTH_INFINITE); + assertTrue("Marker resolution did not decrease number of problems. was: "+markers.length+" now: "+newMarkers.length, newMarkers.length < markers.length); + return; } + fail("Marker resolution: "+resolutionClassName+" not found"); } - } finally { - JobUtils.waitForIdle(); -// TestUtil.waitForValidation(project); } } @@ -102,17 +93,9 @@ ps.put(ELSeverityPreferences.WRONG_BUILDER_ORDER_PREFERENCE_NAME, value); ps = (EclipsePreferences)ELSeverityPreferences.getInstance().getProjectPreferences(project); ps.put(ELSeverityPreferences.WRONG_BUILDER_ORDER_PREFERENCE_NAME, value); - rebuild(); + TestUtil._waitForValidation(project); } - void rebuild() throws CoreException { - ValidatorManager.setStatus(ValidatorManager.RUNNING); - project.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor()); - JobUtils.waitForIdle(); - project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); - TestUtil.waitForValidation(); - } - public void testBuilderOrderResolution() throws CoreException { checkResolution(project, ValidatorManager.ORDER_PROBLEM_MARKER_TYPE, Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java 2011-08-09 00:34:11 UTC (rev 33710) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DependentProjectValidationTest.java 2011-08-09 01:50:39 UTC (rev 33711) @@ -15,12 +15,11 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages; +import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; import org.jboss.tools.tests.AbstractResourceMarkerTest; @@ -40,24 +39,15 @@ public void setUp() throws Exception { project1 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest1"); - project1.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - JobUtils.waitForIdle(); - + TestUtil._waitForValidation(project1); project2 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest2"); - project2.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - JobUtils.waitForIdle(); - + TestUtil._waitForValidation(project2); project3 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest3"); - project3.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - JobUtils.waitForIdle(); - + TestUtil._waitForValidation(project3); project4 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest4"); - project4.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - JobUtils.waitForIdle(); - + TestUtil._waitForValidation(project4); project5 = ResourcesUtils.importProject(PLUGIN_ID, "/projects/CDITest5"); - project5.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); - JobUtils.waitForIdle(); + TestUtil._waitForValidation(project5); } /** @@ -65,8 +55,6 @@ */ public void testDependentProjects() throws CoreException, IOException { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); - IFile testBean3 = project3.getFile("src/cdi/test3/TestBean3.java"); AbstractResourceMarkerTest.assertMarkerIsNotCreated(testBean3, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "TestBean3.foo()"), 10); @@ -78,43 +66,28 @@ IFile scope = project2.getFile(new Path("src/test/TestScope.java")); IFile normalScope = project2.getFile(new Path("src/test/TestNormalScope.validation")); + scope.setContents(normalScope.getContents(), IFile.FORCE, new NullProgressMonitor()); - JobUtils.waitForIdle(1000); - project2.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); - JobUtils.waitForIdle(1000); + TestUtil.validate(scope); - testBean3 = project3.getFile("src/cdi/test3/TestBean3.java"); AbstractResourceMarkerTest.assertMarkerIsCreated(testBean3, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "TestBean3.foo()"), 10); - - testBean4 = project4.getFile("src/cdi/test4/TestBean4.java"); AbstractResourceMarkerTest.assertMarkerIsCreated(testBean4, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "int", "TestBean4.foo()"), 10); - - testBean5 = project5.getFile("src/cdi/test5/TestBean5.java"); AbstractResourceMarkerTest.assertMarkerIsCreated(testBean5, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "TestBean5.foo()"), 10); normalScope = project2.getFile(new Path("src/test/TestScope.java")); scope = project2.getFile(new Path("src/test/TestScope.validation")); + normalScope.setContents(scope.getContents(), IFile.FORCE, new NullProgressMonitor()); - JobUtils.waitForIdle(1000); - project2.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); - JobUtils.waitForIdle(1000); + TestUtil.validate(normalScope); - testBean3 = project3.getFile("src/cdi/test3/TestBean3.java"); AbstractResourceMarkerTest.assertMarkerIsNotCreated(testBean3, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "TestBean3.foo()"), 10); - - testBean4 = project4.getFile("src/cdi/test4/TestBean4.java"); AbstractResourceMarkerTest.assertMarkerIsNotCreated(testBean4, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "int", "TestBean4.foo()"), 10); - - testBean5 = project5.getFile("src/cdi/test5/TestBean5.java"); AbstractResourceMarkerTest.assertMarkerIsNotCreated(testBean5, MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, "boolean", "TestBean5.foo()"), 10); - ResourcesUtils.setBuildAutomatically(saveAutoBuild); - JobUtils.waitForIdle(); } public void tearDown() throws Exception { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); project1.delete(true, true, null); project2.delete(true, true, null); project3.delete(true, true, null); Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java 2011-08-09 00:34:11 UTC (rev 33710) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java 2011-08-09 01:50:39 UTC (rev 33711) @@ -16,6 +16,7 @@ import org.jboss.tools.cdi.core.CDIUtil; import org.jboss.tools.cdi.core.test.tck.TCKTest; import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator; +import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; import org.jboss.tools.tests.AbstractResourceMarkerTest; @@ -34,6 +35,7 @@ @Override protected void setUp() throws Exception { tckProject = TCKTest.importPreparedProject("/"); + TestUtil._waitForValidation(tckProject); } /* @@ -43,7 +45,6 @@ @Override protected void tearDown() throws Exception { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); tckProject.delete(true, true, null); JobUtils.waitForIdle(); ResourcesUtils.setBuildAutomatically(saveAutoBuild); Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELValidationTest.java 2011-08-09 00:34:11 UTC (rev 33710) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ELValidationTest.java 2011-08-09 01:50:39 UTC (rev 33711) @@ -13,10 +13,9 @@ import java.text.MessageFormat; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.runtime.NullProgressMonitor; +import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.jst.web.kb.internal.validation.ELValidationMessages; -import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; import org.jboss.tools.tests.AbstractResourceMarkerTest; @@ -27,7 +26,6 @@ public void testEls() throws Exception { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); try { IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/TestBean.java"); @@ -38,9 +36,7 @@ IFile namedBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/NamedBean.java"); IFile newNamedBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/NewNamedBean.validation"); namedBean.setContents(newNamedBean.getContents(), IFile.FORCE, new NullProgressMonitor()); - JobUtils.waitForIdle(1000); - tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); - JobUtils.waitForIdle(1000); + TestUtil.validate(namedBean); file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/TestBean.java"); AbstractResourceMarkerTest.assertMarkerIsCreated(file, MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, "foo"), 6); @@ -50,9 +46,7 @@ newNamedBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/NamedBean.java"); namedBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/NamedBean.validation"); newNamedBean.setContents(namedBean.getContents(), IFile.FORCE, new NullProgressMonitor()); - JobUtils.waitForIdle(1000); - tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); - JobUtils.waitForIdle(1000); + TestUtil.validate(newNamedBean); file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/TestBean.java"); AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, "foo"), 6); @@ -62,12 +56,9 @@ IFile newNamedBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/NamedBean.java"); IFile namedBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/el/NamedBean.validation"); newNamedBean.setContents(namedBean.getContents(), IFile.FORCE, new NullProgressMonitor()); - JobUtils.waitForIdle(); - tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); - JobUtils.waitForIdle(); + TestUtil.validate(newNamedBean); ResourcesUtils.setBuildAutomatically(saveAutoBuild); - JobUtils.waitForIdle(); } } } \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java 2011-08-09 00:34:11 UTC (rev 33710) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java 2011-08-09 01:50:39 UTC (rev 33711) @@ -11,12 +11,9 @@ package org.jboss.tools.cdi.core.test.tck.validation; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.runtime.NullProgressMonitor; import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages; import org.jboss.tools.jst.jsp.test.TestUtil; -import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager; -import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; import org.jboss.tools.tests.AbstractResourceMarkerTest; @@ -31,7 +28,6 @@ */ public void testInjectionPointRevalidation() throws Exception { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); IFile testInjection = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanBroken.java"); AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7); @@ -40,24 +36,19 @@ IFile testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.java"); IFile testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.validation"); testBean.setContents(testBeanImpl.getContents(), IFile.FORCE, new NullProgressMonitor()); - JobUtils.waitForIdle(1000); - tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); - JobUtils.waitForIdle(1000); + TestUtil.validate(testBean); AbstractResourceMarkerTest.assertMarkerIsCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7); testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2.java"); testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanImpl2Original.validation"); testBeanImpl.setContents(testBean.getContents(), IFile.FORCE, new NullProgressMonitor()); - JobUtils.waitForIdle(1000); - tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); - JobUtils.waitForIdle(1000); + TestUtil.validate(testBeanImpl); AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7); AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7); ResourcesUtils.setBuildAutomatically(saveAutoBuild); - JobUtils.waitForIdle(); } /** @@ -66,7 +57,6 @@ */ public void testInjectionPointResolvedToProducerRevalidation() throws Exception { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); IFile testInjection = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/TestBeanForProducerBroken.java"); AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7); @@ -74,25 +64,22 @@ IFile testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/MarketPlace.java"); IFile testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/MarketPlace.validation"); - ValidatorManager.setStatus("TESTING"); + testBean.setContents(testBeanImpl.getContents(), IFile.FORCE, new NullProgressMonitor()); - tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); - TestUtil.waitForValidation(); + TestUtil.validate(testBean); AbstractResourceMarkerTest.assertMarkerIsCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7); testBeanImpl = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/MarketPlace.java"); testBean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/inject/revalidation/MarketPlaceOriginal.validation"); - ValidatorManager.setStatus("TESTING"); + testBeanImpl.setContents(testBean.getContents(), IFile.FORCE, new NullProgressMonitor()); - tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); - TestUtil.waitForValidation(); + TestUtil.validate(testBeanImpl); AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7); AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7); ResourcesUtils.setBuildAutomatically(saveAutoBuild); - JobUtils.waitForIdle(); } /** @@ -101,7 +88,6 @@ */ public void testAlternativesInBeansXml() throws Exception { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); try { IFile bean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/beansxml/incremental/Test3.java"); @@ -110,26 +96,22 @@ IFile beansXml = tckProject.getFile("JavaSource/META-INF/beans.xml"); IFile emptyBeansXml = tckProject.getFile("JavaSource/META-INF/beans.xml.empty"); - ValidatorManager.setStatus("TESTING ALTERNATIVES 1"); beansXml.setContents(emptyBeansXml.getContents(), IFile.FORCE, new NullProgressMonitor()); - tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); - TestUtil.waitForValidation(); + TestUtil.validate(beansXml); AbstractResourceMarkerTest.assertMarkerIsCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8); IFile beansXmlWithAlternative = tckProject.getFile("JavaSource/META-INF/beans.xml.with.alternative"); - ValidatorManager.setStatus("TESTING ALTERNATIVES 2"); beansXml.setContents(beansXmlWithAlternative.getContents(), IFile.FORCE, new NullProgressMonitor()); - tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); - TestUtil.waitForValidation(); + TestUtil.validate(beansXml); AbstractResourceMarkerTest.assertMarkerIsNotCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8); } finally { IFile beansXml = tckProject.getFile("JavaSource/META-INF/beans.xml"); IFile beansXmlWithAlternative = tckProject.getFile("JavaSource/META-INF/beans.xml.with.alternative"); beansXml.setContents(beansXmlWithAlternative.getContents(), IFile.FORCE, new NullProgressMonitor()); + TestUtil.validate(beansXml); ResourcesUtils.setBuildAutomatically(saveAutoBuild); - JobUtils.waitForIdle(); } } } \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF 2011-08-09 00:34:11 UTC (rev 33710) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF 2011-08-09 01:50:39 UTC (rev 33711) @@ -21,6 +21,7 @@ org.jboss.tools.jst.web.kb, org.jboss.tools.cdi.xml, org.jboss.tools.cdi.seam.solder.core, - org.eclipse.jst.standard.schemas + org.eclipse.jst.standard.schemas, + org.jboss.tools.jst.jsp.test Export-Package: org.jboss.tools.cdi.seam.config.core.test Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2011-08-09 00:34:11 UTC (rev 33710) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2011-08-09 01:50:39 UTC (rev 33711) @@ -83,13 +83,14 @@ } } - public static void waitForValidation() throws CoreException{ + public static boolean waitForValidation() throws CoreException{ for (int i = 0; i < 50; i++) { if(ValidatorManager.getStatus().equals(ValidatorManager.SLEEPING)) { - break; + return true; } JobUtils.delay(100); JobUtils.waitForIdle(); } + return false; } } \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ContextValidationHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ContextValidationHelper.java 2011-08-09 00:34:11 UTC (rev 33710) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ContextValidationHelper.java 2011-08-09 01:50:39 UTC (rev 33711) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jst.web.kb.internal.validation; +import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -131,10 +132,15 @@ } private Set<IProject> getAllProjects() { + IProject project = getProject(); + if(!project.isAccessible()) { + return Collections.emptySet(); + } + List<IValidator> validators = getValidationContextManager().getValidators(); Set<IProject> projects = new HashSet<IProject>(); for (IValidator validator : validators) { - IValidatingProjectTree tree = validator.getValidatingProjects(getProject()); + IValidatingProjectTree tree = validator.getValidatingProjects(project); projects.addAll(tree.getAllProjects()); } return projects;