Author: scabanovich Date: 2011-04-19 14:36:38 -0400 (Tue, 19 Apr 2011) New Revision: 30664 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Current.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Permission.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Unwrapped.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/UnwrapsTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java Log: JBIDE-8715 https://issues.jboss.org/browse/JBIDE-8715 Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Current.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Current.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Current.java 2011-04-19 18:36:38 UTC (rev 30664) @@ -0,0 +1,21 @@ +package org.jboss.unwraps; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +@Qualifier +@Target({ TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +public @interface Current { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Current.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Permission.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Permission.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Permission.java 2011-04-19 18:36:38 UTC (rev 30664) @@ -0,0 +1,5 @@ +package org.jboss.unwraps; + +public class Permission { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Permission.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Unwrapped.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Unwrapped.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Unwrapped.java 2011-04-19 18:36:38 UTC (rev 30664) @@ -0,0 +1,17 @@ +package org.jboss.unwraps; + +import javax.inject.Inject; + +import org.jboss.seam.solder.unwraps.Unwraps; + +public class Unwrapped { + + @Unwraps @Current + Permission getPermission() { + return new Permission(); + } + + @Inject @Current + Permission permission; + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/unwraps/Unwrapped.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java 2011-04-19 18:36:10 UTC (rev 30663) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java 2011-04-19 18:36:38 UTC (rev 30664) @@ -31,6 +31,7 @@ suiteAll.addTestSuite(MessageLoggerTest.class); suiteAll.addTestSuite(ServiceHandlerTest.class); suiteAll.addTestSuite(DefaultBeanTest.class); + suiteAll.addTestSuite(UnwrapsTest.class); SeamSolderTestSetup suite = new SeamSolderTestSetup(suiteAll); 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-04-19 18:36:10 UTC (rev 30663) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/SeamSolderTest.java 2011-04-19 18:36:38 UTC (rev 30664) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.cdi.seam.solder.core.test; +import java.util.Iterator; import java.util.Set; import junit.framework.TestCase; @@ -22,6 +23,7 @@ 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.test.util.ResourcesUtils; /** @@ -64,6 +66,11 @@ 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) { Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/UnwrapsTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/UnwrapsTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/UnwrapsTest.java 2011-04-19 18:36:38 UTC (rev 30664) @@ -0,0 +1,51 @@ +/******************************************************************************* + * 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.seam.solder.core.test; + +import java.io.IOException; +import java.util.Set; + +import org.eclipse.core.runtime.CoreException; +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.IInjectionPointField; +import org.jboss.tools.cdi.core.IProducerMethod; +import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants; + +/** + * + * @author Viacheslav Kabanovich + * + */ +public class UnwrapsTest extends SeamSolderTest { + + public UnwrapsTest() {} + + public void testUnwraps() throws CoreException, IOException { + ICDIProject cdi = CDICorePlugin.getCDIProject(project, true); + + IInjectionPointField logger = getInjectionPointField(cdi, "src/org/jboss/unwraps/Unwrapped.java", "permission"); + + Set<IBean> bs = cdi.getBeans(false, logger); + assertEquals(1, bs.size()); + + IBean b = bs.iterator().next(); + + assertTrue(b instanceof IProducerMethod); + + IProducerMethod m = (IProducerMethod)b; + assertTrue(m.isAnnotationPresent(CDISeamSolderConstants.UNWRAPS_ANNOTATION_TYPE_NAME)); + assertEquals("getPermission", m.getMethod().getElementName()); + + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/UnwrapsTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain