Author: akazakov Date: 2011-07-07 14:59:42 -0400 (Thu, 07 Jul 2011) New Revision: 32724 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml.empty trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml.with.alternative trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test1.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test3.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/TestAlt.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java Removed: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/placeholder.txt Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java Log: https://issues.jboss.org/browse/JBIDE-9306 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java 2011-07-07 18:42:06 UTC (rev 32723) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/BeansXmlValidationDelegate.java 2011-07-07 18:59:42 UTC (rev 32724) @@ -14,6 +14,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -187,6 +188,14 @@ if(type!=null) { if(!type.isBinary()) { validator.getValidationContext().addLinkedCoreResource(CDICoreValidator.SHORT_ID, beansXml.getFullPath().toOSString(), type.getPath(), false); + Set<IPath> relatedResources = new HashSet<IPath>(); + IResource resource = type.getResource(); + if(resource instanceof IFile) { + validator.collectAllRelatedInjectionsForBean((IFile)resource, relatedResources); + for (IPath path : relatedResources) { + validator.getValidationContext().addLinkedCoreResource(CDICoreValidator.SHORT_ID, path.toOSString(), beansXml.getFullPath(), false); + } + } } if(!typeValidator.validateKindOfType(type)) { validator.addError(typeValidator.getIllegalTypeErrorMessage(), CDIPreferences.ILLEGAL_TYPE_NAME_IN_BEANS_XML, @@ -225,7 +234,7 @@ private Map<IProject, IJavaProject> javaProjects; - private IJavaProject getJavaProject(IResource resource) { + public IJavaProject getJavaProject(IResource resource) { if(javaProjects == null) { javaProjects = new HashMap<IProject, IJavaProject>(); } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-07 18:42:06 UTC (rev 32723) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-07 18:59:42 UTC (rev 32724) @@ -91,6 +91,7 @@ import org.jboss.tools.common.java.ParametedType; import org.jboss.tools.common.model.util.EclipseJavaUtil; import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.common.text.INodeReference; import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper; import org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager; @@ -1380,6 +1381,35 @@ } private void collectAllRelatedInjections(IFile validatingResource, Set<IPath> relatedResources) { + collectAllRelatedInjectionsForBean(validatingResource, relatedResources); + if("beans.xml".equals(validatingResource.getName().toLowerCase())) { + List<INodeReference> nodes = cdiProject.getAlternativeClasses(); + collectAllRelatedInjectionsForNode(nodes, relatedResources); + nodes = cdiProject.getDecoratorClasses(); + collectAllRelatedInjectionsForNode(nodes, relatedResources); + nodes = cdiProject.getInterceptorClasses(); + collectAllRelatedInjectionsForNode(nodes, relatedResources); + } + } + + private void collectAllRelatedInjectionsForNode(List<INodeReference> nodes, Set<IPath> relatedResources) { + try { + for (INodeReference node : nodes) { + String className = node.getValue(); + IType type = EclipseJavaUtil.findType(beansXmlValidator.getJavaProject(node.getResource()), className); + if(type!=null && !type.isBinary()) { + IResource resource = type.getResource(); + if(type!=null && resource instanceof IFile) { + collectAllRelatedInjectionsForBean((IFile)resource, relatedResources); + } + } + } + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + } + } + + public void collectAllRelatedInjectionsForBean(IFile validatingResource, Set<IPath> relatedResources) { Set<IBean> beans = cdiProject.getBeans(validatingResource.getFullPath()); for (IBean bean : beans) { Set<IParametedType> types = bean.getAllTypes(); Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml 2011-07-07 18:59:42 UTC (rev 32724) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd"> + <alternatives> + <class>org.jboss.jsr299.tck.tests.jbt.validation.beansxml.incremental.Test1</class> + </alternatives> +</beans> \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml.empty =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml.empty (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml.empty 2011-07-07 18:59:42 UTC (rev 32724) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd"> +</beans> \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml.with.alternative =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml.with.alternative (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/META-INF/beans.xml.with.alternative 2011-07-07 18:59:42 UTC (rev 32724) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://jboss.org/schema/cdi/beans_1_0.xsd"> + <alternatives> + <class>org.jboss.jsr299.tck.tests.jbt.validation.beansxml.incremental.Test1</class> + </alternatives> +</beans> \ No newline at end of file Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/JavaSource/placeholder.txt =================================================================== Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test1.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test1.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test1.java 2011-07-07 18:59:42 UTC (rev 32724) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.beansxml.incremental; + +import javax.enterprise.inject.Alternative; + +@Alternative +public class Test1 extends TestAlt { + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test1.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test3.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test3.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test3.java 2011-07-07 18:59:42 UTC (rev 32724) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.beansxml.incremental; + +import javax.inject.Inject; + +public class Test3 { + + // See META-INF/beans.xml + @Inject TestAlt test; +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/Test3.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/TestAlt.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/TestAlt.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/TestAlt.java 2011-07-07 18:59:42 UTC (rev 32724) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.beansxml.incremental; + +import javax.enterprise.inject.Alternative; + +@Alternative +public class TestAlt { + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/beansxml/incremental/TestAlt.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-07 18:42:06 UTC (rev 32723) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-07 18:59:42 UTC (rev 32724) @@ -52,6 +52,7 @@ import org.jboss.tools.cdi.core.test.tck.validation.DeploymentProblemsValidationTests; import org.jboss.tools.cdi.core.test.tck.validation.DisableCDISupportTest; import org.jboss.tools.cdi.core.test.tck.validation.ELValidationTest; +import org.jboss.tools.cdi.core.test.tck.validation.IncrementalValidationTest; import org.jboss.tools.test.util.ProjectImportTestSetup; /** @@ -99,6 +100,7 @@ suite.addTestSuite(AnnotationsValidationTest.class); suite.addTestSuite(CoreValidationTest.class); suite.addTestSuite(ELValidationTest.class); + suite.addTestSuite(IncrementalValidationTest.class); suiteAll.addTestSuite(TwoWebContentFoldersTest.class); suiteAll.addTestSuite(RemoveJarFromClasspathTest.class); Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java 2011-07-07 18:42:06 UTC (rev 32723) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DeploymentProblemsValidationTests.java 2011-07-07 18:59:42 UTC (rev 32724) @@ -14,13 +14,7 @@ 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.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; /** @@ -251,76 +245,6 @@ } /** - * See https://issues.jboss.org/browse/JBIDE-8325 - * @throws Exception - */ - 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); - AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7); - - 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); - - 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); - - AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7); - AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7); - - ResourcesUtils.setBuildAutomatically(saveAutoBuild); - JobUtils.waitForIdle(); - } - - /** - * See https://issues.jboss.org/browse/JBIDE-9071 - * @throws Exception - */ - 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); - AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7); - - 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(tckProject); - - 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(tckProject); - - AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7); - AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7); - - ResourcesUtils.setBuildAutomatically(saveAutoBuild); - JobUtils.waitForIdle(); - } - - /** * 6.6.4 Validation of passivation capable beans and dependencies * - If a managed bean which declares a passivating scope is not passivation capable, then the container automatically detects the problem and treats it as a deployment problem. * Added: 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 (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java 2011-07-07 18:59:42 UTC (rev 32724) @@ -0,0 +1,136 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +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; + +/** + * @author Alexey Kazakov + */ +public class IncrementalValidationTest extends ValidationTest { + + /** + * See https://issues.jboss.org/browse/JBIDE-8325 + * @throws Exception + */ + 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); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7); + + 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); + + 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); + + AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7); + + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + JobUtils.waitForIdle(); + } + + /** + * See https://issues.jboss.org/browse/JBIDE-9071 + * @throws Exception + */ + 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); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7); + + 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(tckProject); + + 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(tckProject); + + AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, 7); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(testInjection, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 7); + + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + JobUtils.waitForIdle(); + } + + /** + * See https://issues.jboss.org/browse/JBIDE-9306 + * @throws Exception + */ + 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"); +// AbstractResourceMarkerTest.assertMarkerIsNotCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8); +// +// IFile beansXml = tckProject.getFile("JavaSource/META-INF/beans.xml"); +// IFile emptyBeansXml = tckProject.getFile("JavaSource/META-INF/beans.xml.empty"); +// +// ValidatorManager.setStatus("TESTING"); +// beansXml.setContents(emptyBeansXml.getContents(), IFile.FORCE, new NullProgressMonitor()); +// tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); +// TestUtil.waitForValidation(tckProject); +// +// AbstractResourceMarkerTest.assertMarkerIsCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8); +// +// IFile beansXmlWithAlternative = tckProject.getFile("JavaSource/META-INF/beans.xml.with.alternative"); +// +// ValidatorManager.setStatus("TESTING"); +// beansXml.setContents(beansXmlWithAlternative.getContents(), IFile.FORCE, new NullProgressMonitor()); +// tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); +// TestUtil.waitForValidation(tckProject); +// +// 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()); +// ResourcesUtils.setBuildAutomatically(saveAutoBuild); +// JobUtils.waitForIdle(); +// } + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain