Author: scabanovich Date: 2011-07-13 13:11:26 -0400 (Wed, 13 Jul 2011) New Revision: 32900 Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java Log: JBIDE-9313 https://issues.jboss.org/browse/JBIDE-9313 Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF 2011-07-13 17:10:44 UTC (rev 32899) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF 2011-07-13 17:11:26 UTC (rev 32900) @@ -10,6 +10,7 @@ org.eclipse.core.resources, org.junit, org.jboss.tools.cdi.core, + org.jboss.tools.cdi.core.test, org.jboss.tools.cdi.seam.solder.core, org.jboss.tools.common, org.eclipse.ui, Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java 2011-07-13 17:10:44 UTC (rev 32899) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java 2011-07-13 17:11:26 UTC (rev 32900) @@ -18,12 +18,14 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.osgi.internal.loader.buddy.DependentPolicy; import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IInjectionPointField; import org.jboss.tools.cdi.core.IProducer; +import org.jboss.tools.cdi.core.test.DependentProjectTest; import org.jboss.tools.test.util.ResourcesUtils; /** @@ -64,25 +66,7 @@ } protected IInjectionPointField getInjectionPointField(ICDIProject cdi, String beanClassFilePath, String fieldName) { - IFile file = cdi.getNature().getProject().getFile(beanClassFilePath); - Set<IBean> beans = cdi.getBeans(file.getFullPath()); - Iterator<IBean> it = beans.iterator(); - while(it.hasNext()) { - IBean b = it.next(); - if(b instanceof IProducer) it.remove(); - } - assertEquals("Wrong number of the beans", 1, beans.size()); - Set<IInjectionPoint> injections = beans.iterator().next().getInjectionPoints(); - for (IInjectionPoint injectionPoint : injections) { - if(injectionPoint instanceof IInjectionPointField) { - IInjectionPointField field = (IInjectionPointField)injectionPoint; - if(fieldName.equals(field.getField().getElementName())) { - return field; - } - } - } - fail("Can't find \"" + fieldName + "\" injection point filed in " + beanClassFilePath); - return null; + return DependentProjectTest.getInjectionPointField(cdi, beanClassFilePath, fieldName); } }