Author: pete.muir(a)jboss.org Date: 2009-04-17 08:17:11 -0400 (Fri, 17 Apr 2009) New Revision: 2464 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/Another.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfPrimitiveResourceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/SimpleBean.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/web.xml Log: A working resource injection test Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource (from rev 2457, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant) Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/Another.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/Another.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/Another.java 2009-04-17 12:17:11 UTC (rev 2464) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.xml.resource.resource; + +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; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +@Target( { TYPE, METHOD, PARAMETER, FIELD }) +@Retention(RUNTIME) +@Documented +@BindingType +@interface Another +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/Another.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfPrimitiveResourceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java 2009-04-17 10:20:14 UTC (rev 2457) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfPrimitiveResourceTest.java 2009-04-17 12:17:11 UTC (rev 2464) @@ -1,38 +0,0 @@ -package org.jboss.jsr299.tck.tests.xml.resource.constant; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.hibernate.tck.annotations.SpecAssertions; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.IntegrationTest; -import org.jboss.testharness.impl.packaging.Packaging; -import org.jboss.testharness.impl.packaging.PackagingType; -import org.jboss.testharness.impl.packaging.Resource; -import org.jboss.testharness.impl.packaging.Resources; -import org.jboss.testharness.impl.packaging.jsr299.BeansXml; -import org.testng.annotations.Test; - -@Artifact -(a)Packaging(PackagingType.WAR) -@IntegrationTest -@Resources({ - @Resource(source="web.xml", destination="WEB-INF/web.xml") -}) -(a)BeansXml(&quot;beans.xml&quot;) -public class InjectionOfPrimitiveResourceTest extends AbstractJSR299Test -{ - @Test(groups = { "xml", "broken" }) - @SpecAssertions( { - @SpecAssertion(section = "6.9", id = "f"), - @SpecAssertion(section = "3.6", id = "a"), - @SpecAssertion(section = "3.6", id = "f"), - @SpecAssertion(section = "3.6.1", id = "a"), - @SpecAssertion(section = "3.6.1", id = "f") - }) - public void testInjectionOfSimpleResource() - { - SimpleBean bean = getCurrentManager().getInstanceByType(SimpleBean.class); - assert bean.getInjectedCode() != null : "Integer code was not injected into bean"; - assert bean.getInjectedCode() == 42 : "Wrong code value injected into bean"; - } -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java 2009-04-17 12:17:11 UTC (rev 2464) @@ -0,0 +1,36 @@ +package org.jboss.jsr299.tck.tests.xml.resource.resource; + +import javax.inject.AnnotationLiteral; +import javax.inject.manager.Manager; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.hibernate.tck.annotations.SpecAssertions; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +@Artifact +(a)Packaging(PackagingType.WAR) +@IntegrationTest +(a)BeansXml(&quot;beans.xml&quot;) +public class InjectionOfResourceTest extends AbstractJSR299Test +{ + @Test(groups = { "xml" }) + @SpecAssertions( { + @SpecAssertion(section = "6.9", id = "f"), + @SpecAssertion(section = "3.6", id = "a"), + @SpecAssertion(section = "3.6", id = "f"), + @SpecAssertion(section = "3.6.1", id = "a"), + @SpecAssertion(section = "3.6.1", id = "f") + }) + public void testInjectionOfResource() + { + Manager manager = getCurrentManager().getInstanceByType(Manager.class, new AnnotationLiteral<Another>() {}); + assert manager != null : "@Another Manager was not injected into bean"; + assert manager.equals(getCurrentManager()): "Wrong manager injected into bean"; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/InjectionOfResourceTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/SimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java 2009-04-17 10:20:14 UTC (rev 2457) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/resource/SimpleBean.java 2009-04-17 12:17:11 UTC (rev 2464) @@ -1,12 +0,0 @@ -package org.jboss.jsr299.tck.tests.xml.resource.constant; - -public class SimpleBean -{ - private Integer injectedCode = null; - - public Integer getInjectedCode() - { - return injectedCode; - } - -} Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource (from rev 2457, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant) Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/beans.xml 2009-04-17 10:20:14 UTC (rev 2457) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml 2009-04-17 12:17:11 UTC (rev 2464) @@ -1,12 +0,0 @@ -<Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.resource.ejb"> - <Deploy> - <Standard /> - <Production /> - </Deploy> - <test:SimpleBean> - <Resource> - <name>AnswerToLife</name> - </Resource> - </test:SimpleBean> -</Beans> Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml (from rev 2463, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/beans.xml) =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/beans.xml 2009-04-17 12:17:11 UTC (rev 2464) @@ -0,0 +1,11 @@ +<Beans xmlns="urn:java:ee" + xmlns:app="urn:java:org.jboss.jsr299.tck.tests.xml.resource.resource" + xmlns:m="urn:java:javax.inject.manager"> + + <m:Manager> + <Resource> + <mappedName>java:app/Manager</mappedName> + </Resource> + <app:Another /> + </m:Manager> +</Beans> Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/web.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/web.xml 2009-04-17 10:20:14 UTC (rev 2457) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/resource/web.xml 2009-04-17 12:17:11 UTC (rev 2464) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.5" 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://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - <description>Test servlets used to test session contexts.</description> - <display-name>Session Context Tests</display-name> - - <!-- resource-ref> - <res-ref-name>AnswerToLife</res-ref-name> - <res-type>java.lang.Integer</res-type> - <mapped-name>constants/AnswerToLife</mapped-name> - </resource-ref --> - - <env-entry> - <env-entry-name>AnswerToLife</env-entry-name> - <env-entry-type>java.lang.Integer</env-entry-type> - <env-entry-value>42</env-entry-value> - <mapped-name>constants/AnswerToLife</mapped-name> - </env-entry> - - <session-config> - <session-timeout>10</session-timeout> - </session-config> - <login-config> - <auth-method>BASIC</auth-method> - </login-config> -</web-app> \ No newline at end of file