[jbosstools-commits] JBoss Tools SVN: r35782 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: projects/CDITest1/src/cdi/test/observers and 3 other directories.

Author: scabanovich Date: 2011-10-18 20:23:21 -0400 (Tue, 18 Oct 2011) New Revision: 35782 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/observers/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/observers/BaseDecoratedInterface.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/observers/CDIBeanTest.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/cdi/test/observers/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/cdi/test/observers/TestBean.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java Log: JBIDE-9904 https://issues.jboss.org/browse/JBIDE-9904 CDIProject.findObservedEvents(IParameter) improved. Tests are added. Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/observers/BaseDecoratedInterface.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/observers/BaseDecoratedInterface.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/observers/BaseDecoratedInterface.java 2011-10-19 00:23:21 UTC (rev 35782) @@ -0,0 +1,5 @@ +package cdi.test.observers; + +public interface BaseDecoratedInterface { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/observers/BaseDecoratedInterface.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/observers/CDIBeanTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/observers/CDIBeanTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/observers/CDIBeanTest.java 2011-10-19 00:23:21 UTC (rev 35782) @@ -0,0 +1,9 @@ +package cdi.test.observers; + +import javax.enterprise.event.Observes; + +public class CDIBeanTest { + public void method(@Observes BaseDecoratedInterface event) { + + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest1/src/cdi/test/observers/CDIBeanTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/cdi/test/observers/TestBean.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/cdi/test/observers/TestBean.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/cdi/test/observers/TestBean.java 2011-10-19 00:23:21 UTC (rev 35782) @@ -0,0 +1,9 @@ +package cdi.test.observers; + +import javax.enterprise.event.Event; +import javax.inject.Inject; + +public class TestBean implements BaseDecoratedInterface { + @Inject + Event<TestBean> event; +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/CDITest2/src/cdi/test/observers/TestBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2011-10-19 00:22:55 UTC (rev 35781) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/DependentProjectTest.java 2011-10-19 00:23:21 UTC (rev 35782) @@ -23,6 +23,7 @@ import org.jboss.tools.cdi.core.IClassBean; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IInjectionPointField; +import org.jboss.tools.cdi.core.IObserverMethod; import org.jboss.tools.cdi.core.IProducer; import org.jboss.tools.cdi.core.IProducerMethod; import org.jboss.tools.cdi.core.IQualifier; @@ -372,6 +373,22 @@ assertEquals(1, bs3.size()); } + public void testFindObservedEvents() throws CoreException { + ICDIProject cdi1 = CDICorePlugin.getCDIProject(project1, true); + Set<IBean> bs = cdi1.getBeans(new Path("/CDITest1/src/cdi/test/observers/CDIBeanTest.java")); + assertFalse(bs.isEmpty()); + IBean b = bs.iterator().next(); + assertTrue(b instanceof IClassBean); + IClassBean cb = (IClassBean)b; + Set<IObserverMethod> ms = cb.getObserverMethods(); + assertEquals(1, ms.size()); + IObserverMethod m = ms.iterator().next(); + Set<IInjectionPoint> ps = cdi1.findObservedEvents(m.getObservedParameters().iterator().next()); + assertEquals(1, ps.size()); + IInjectionPoint p = ps.iterator().next(); + assertTrue(p.getDeclaringProject() == CDICorePlugin.getCDIProject(project2, true)); + } + public void testCleanDependentProject() throws CoreException, IOException { ICDIProject cdi2 = CDICorePlugin.getCDIProject(project2, true); boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);