Author: pete.muir(a)jboss.org Date: 2009-04-17 08:07:53 -0400 (Fri, 17 Apr 2009) New Revision: 2463 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/persistence.xml Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java 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/constant/web.xml Log: Add test injection of persistence context Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java 2009-04-17 12:06:26 UTC (rev 2462) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/InjectionOfPrimitiveResourceTest.java 2009-04-17 12:07:53 UTC (rev 2463) @@ -31,8 +31,8 @@ }) 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"; + Integer integer = getCurrentManager().getInstanceByType(Integer.class); + assert integer != null : "Integer code was not injected into bean"; + assert integer.intValue() == 42 : "Wrong code value injected into bean"; } } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java 2009-04-17 12:06:26 UTC (rev 2462) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/constant/SimpleBean.java 2009-04-17 12:07:53 UTC (rev 2463) @@ -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; - } - -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java 2009-04-17 12:06:26 UTC (rev 2462) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/ejb/InjectionOfEjbTest.java 2009-04-17 12:07:53 UTC (rev 2463) @@ -46,7 +46,7 @@ @EjbJarXml("ejb-jar.xml") public class InjectionOfEjbTest extends AbstractJSR299Test { - @Test(groups = { "xml", "broken" }) + @Test(groups = { "xml" }) @SpecAssertions( { @SpecAssertion(section = "6.9", id = "i"), @SpecAssertion(section = "3.6", id = "d"), Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java 2009-04-17 12:07:53 UTC (rev 2463) @@ -0,0 +1,40 @@ +package org.jboss.jsr299.tck.tests.xml.resource.persistenceContext; + +import javax.persistence.EntityManager; + +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="persistence.xml", destination="WEB-INF/persistence.xml") +}) +(a)BeansXml(&quot;beans.xml&quot;) +public class InjectionOfPersistenceContextTest extends AbstractJSR299Test +{ + @Test(groups = { "xml" }) + @SpecAssertions( { + @SpecAssertion(section = "6.9", id = "g"), + @SpecAssertion(section = "3.6", id = "b"), + @SpecAssertion(section = "3.6", id = "g"), + @SpecAssertion(section = "3.6.1", id = "b"), + @SpecAssertion(section = "3.6.1", id = "g") + }) + public void testInjectionOfPersistenceContext() + { + EntityManager entityManager = getCurrentManager().getInstanceByType(EntityManager.class); + assert entityManager != null : "Persistence context was not injected into bean"; + assert entityManager.isOpen() : "persistence context not open injected into bean"; + } +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/InjectionOfPersistenceContextTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: 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/constant/beans.xml 2009-04-17 12:06:26 UTC (rev 2462) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/beans.xml 2009-04-17 12:07:53 UTC (rev 2463) @@ -1,12 +1,7 @@ -<Beans xmlns="urn:java:ee" - xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.resource.ejb"> - <Deploy> - <Standard /> - <Production /> - </Deploy> - <test:SimpleBean> +<Beans xmlns="urn:java:ee"> + <Integer> <Resource> - <name>AnswerToLife</name> + <mappedName>constants/AnswerToLife</mappedName> </Resource> - </test:SimpleBean> + </Integer> </Beans> Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/web.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/web.xml 2009-04-17 12:06:26 UTC (rev 2462) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/constant/web.xml 2009-04-17 12:07:53 UTC (rev 2463) @@ -1,6 +1,7 @@ <?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"> + 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> @@ -17,10 +18,4 @@ <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 Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/beans.xml 2009-04-17 12:07:53 UTC (rev 2463) @@ -0,0 +1,7 @@ +<Beans xmlns="urn:java:ee"> + <EntityManager> + <PersistenceContext> + <unitName>test</unitName> + </PersistenceContext> + </EntityManager> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/persistence.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/persistence.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/persistence.xml 2009-04-17 12:07:53 UTC (rev 2463) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" + version="1.0"> + <persistence-unit name="test"> + <jta-data-source>java:/DefaultDS</jta-data-source> + </persistence-unit> +</persistence> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/resource/persistenceContext/persistence.xml ___________________________________________________________________ Name: svn:mime-type + text/plain