[webbeans-commits] Webbeans SVN: r3654 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource: persistenceContext and 1 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Sun Sep 13 17:08:34 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-09-13 17:08:34 -0400 (Sun, 13 Sep 2009)
New Revision: 3654
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanRemote.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanLocal.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Bean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ManagedBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ResourceProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ManagedBean.java
Log:
Some tests for 7.3.6
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Bean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Bean.java 2009-09-08 16:31:25 UTC (rev 3653)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/Bean.java 2009-09-13 21:08:34 UTC (rev 3654)
@@ -10,10 +10,9 @@
import javax.transaction.SystemException;
import javax.transaction.UserTransaction;
-public
@Stateful
@TransactionManagement(TransactionManagementType.BEAN)
-class Bean implements BeanLocal
+public class Bean implements BeanRemote
{
private int knocks = 0;
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanLocal.java 2009-09-08 16:31:25 UTC (rev 3653)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanLocal.java 2009-09-13 21:08:34 UTC (rev 3654)
@@ -1,17 +0,0 @@
-package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb;
-
-import javax.ejb.Local;
-
- at Local
-public interface BeanLocal extends AnotherInterface
-{
- public String knockKnock();
-
- public int getKnocks();
-
- public boolean isUserTransactionInjected();
-
- public void cleanup();
-
- public void dispose();
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanRemote.java (from rev 3645, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanLocal.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanRemote.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanRemote.java 2009-09-13 21:08:34 UTC (rev 3654)
@@ -0,0 +1,17 @@
+package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb;
+
+import javax.ejb.Remote;
+
+ at Remote
+public interface BeanRemote extends AnotherInterface
+{
+ public String knockKnock();
+
+ public int getKnocks();
+
+ public boolean isUserTransactionInjected();
+
+ public void cleanup();
+
+ public void dispose();
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/BeanRemote.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-09-08 16:31:25 UTC (rev 3653)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/EjbInjectionTest.java 2009-09-13 21:08:34 UTC (rev 3654)
@@ -43,9 +43,12 @@
@SpecVersion(spec="cdi", version="1.0.20090625")
public class EjbInjectionTest extends AbstractJSR299Test
{
+
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
@SpecAssertions({
- @SpecAssertion(section = "3.5.1", id = "ee")
+ @SpecAssertion(section = "3.5.1", id = "ee"),
+ @SpecAssertion(section = "7.3.6", id = "ld"),
+ @SpecAssertion(section = "7.3.6", id = "mg")
})
public void testInjectionOfEjbs()
{
@@ -55,5 +58,19 @@
assert instance.getMyEjb() != null : "EJB reference was not produced and injected into bean";
assert instance.getMyEjb().knockKnock().equals("We're home");
}
+
+ @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
+ @SpecAssertions({
+ @SpecAssertion(section = "7.3.6", id = "mh")
+ })
+ public void testPassivationOfEjbs() throws Exception
+ {
+ Bean<ManagedBean> managedBean = getBeans(ManagedBean.class).iterator().next();
+ CreationalContext<ManagedBean> creationalContext = getCurrentManager().createCreationalContext(managedBean);
+ ManagedBean instance = managedBean.create(creationalContext);
+ instance = (ManagedBean) deserialize(serialize(instance));
+ assert instance.getMyEjb() != null : "EJB reference was not produced and injected into bean";
+ assert instance.getMyEjb().knockKnock().equals("We're home");
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ManagedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ManagedBean.java 2009-09-08 16:31:25 UTC (rev 3653)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ManagedBean.java 2009-09-13 21:08:34 UTC (rev 3654)
@@ -1,14 +1,16 @@
package org.jboss.jsr299.tck.tests.implementation.simple.resource.ejb;
+import java.io.Serializable;
+
import javax.inject.Inject;
-class ManagedBean
+class ManagedBean implements Serializable
{
@Inject @Lazy
- private BeanLocal myEjb;
+ private BeanRemote myEjb;
- public BeanLocal getMyEjb()
+ public BeanRemote getMyEjb()
{
return myEjb;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ResourceProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ResourceProducer.java 2009-09-08 16:31:25 UTC (rev 3653)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/ResourceProducer.java 2009-09-13 21:08:34 UTC (rev 3654)
@@ -5,5 +5,5 @@
class ResourceProducer
{
- private @Produces @EJB @Lazy BeanLocal remoteEjb;
+ private @Produces @EJB @Lazy BeanRemote remoteEjb;
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java 2009-09-08 16:31:25 UTC (rev 3653)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java 2009-09-13 21:08:34 UTC (rev 3654)
@@ -1,10 +1,12 @@
package org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext;
+import java.io.Serializable;
+
import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
-class ManagedBean
+class ManagedBean implements Serializable
{
@Inject @Database
private EntityManager persistenceContext;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-09-08 16:31:25 UTC (rev 3653)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-09-13 21:08:34 UTC (rev 3654)
@@ -34,7 +34,9 @@
{
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
@SpecAssertions( {
- @SpecAssertion(section = "3.5.1", id = "cc")
+ @SpecAssertion(section = "3.5.1", id = "cc"),
+ @SpecAssertion(section="7.3.6", id="lb"),
+ @SpecAssertion(section="7.3.6", id="mc")
})
public void testInjectionOfPersistenceContext()
{
@@ -47,7 +49,9 @@
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
@SpecAssertions( {
- @SpecAssertion(section = "3.5.1", id = "dd")
+ @SpecAssertion(section = "3.5.1", id = "dd"),
+ @SpecAssertion(section="7.3.6", id="lc"),
+ @SpecAssertion(section="7.3.6", id="me")
})
public void testInjectionOfPersistenceUnit()
{
@@ -60,6 +64,35 @@
@Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
@SpecAssertions( {
+ @SpecAssertion(section="7.3.6", id="md")
+ })
+ public void testPassivationOfPersistenceContext() throws Exception
+ {
+ Bean<ManagedBean> managedBeanBean = getBeans(ManagedBean.class).iterator().next();
+ CreationalContext<ManagedBean> managedBeanCc = getCurrentManager().createCreationalContext(managedBeanBean);
+ ManagedBean managedBean = managedBeanBean.create(managedBeanCc);
+ managedBean = (ManagedBean) deserialize(serialize(managedBean));
+ assert managedBean.getPersistenceContext() != null : "Persistence context was not injected into bean";
+ assert managedBean.getPersistenceContext().isOpen() : "Persistence context not open injected into bean";
+ }
+
+ @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
+ @SpecAssertions( {
+ @SpecAssertion(section="7.3.6", id="lc"),
+ @SpecAssertion(section="7.3.6", id="mf")
+ })
+ public void testPassivationOfPersistenceUnit() throws Exception
+ {
+ Bean<ManagedBean> managedBeanBean = getBeans(ManagedBean.class).iterator().next();
+ CreationalContext<ManagedBean> managedBeanCc = getCurrentManager().createCreationalContext(managedBeanBean);
+ ManagedBean managedBean = managedBeanBean.create(managedBeanCc);
+ managedBean = (ManagedBean) deserialize(serialize(managedBean));
+ assert managedBean.getPersistenceUnit() != null : "Persistence unit was not injected into bean";
+ assert managedBean.getPersistenceUnit().isOpen() : "Persistence unit not open injected into bean";
+ }
+
+ @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
+ @SpecAssertions( {
@SpecAssertion(section = "3.5.2", id = "a"),
@SpecAssertion(section = "3.5.1", id = "hh")
})
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2009-09-08 16:31:25 UTC (rev 3653)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2009-09-13 21:08:34 UTC (rev 3654)
@@ -48,4 +48,17 @@
assert beanManager != null;
assert beanManager.equals(getCurrentManager());
}
+
+ @Test(groups = { "beanLifecycle", "commonsAnnotations", "integration" })
+ @SpecAssertions({
+ @SpecAssertion(section = "7.3.6", id = "mb")
+ })
+ public void testPassivatingResource() throws Exception
+ {
+ Bean<ManagedBean> managedBeanBean = getBeans(ManagedBean.class).iterator().next();
+ CreationalContext<ManagedBean> managedBeanCc = getCurrentManager().createCreationalContext(managedBeanBean);
+ ManagedBean managedBean = managedBeanBean.create(managedBeanCc);
+ managedBean = (ManagedBean) deserialize(serialize(managedBean));
+ assert managedBean.getBeanManager() != null;
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ManagedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ManagedBean.java 2009-09-08 16:31:25 UTC (rev 3653)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/ManagedBean.java 2009-09-13 21:08:34 UTC (rev 3654)
@@ -1,9 +1,11 @@
package org.jboss.jsr299.tck.tests.implementation.simple.resource.resource;
+import java.io.Serializable;
+
import javax.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
-class ManagedBean
+class ManagedBean implements Serializable
{
@Inject @Another
private BeanManager beanManager;
More information about the weld-commits
mailing list