[weld-commits] Weld SVN: r6951 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-08-10 16:34:02 -0400 (Tue, 10 Aug 2010)
New Revision: 6951

Modified:
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java
Log:
CDITCK-169

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java	2010-08-10 20:31:35 UTC (rev 6950)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/ManagedBean.java	2010-08-10 20:34:02 UTC (rev 6951)
@@ -22,7 +22,7 @@
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-class ManagedBean implements Serializable
+public class ManagedBean implements Serializable
 {
    @Inject @Database 
    private EntityManager persistenceContext;

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java	2010-08-10 20:31:35 UTC (rev 6950)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java	2010-08-10 20:34:02 UTC (rev 6951)
@@ -55,11 +55,10 @@
    })
    public void testInjectionOfPersistenceContext()
    {
-      Bean<ManagedBean> managedBeanBean = getBeans(ManagedBean.class).iterator().next();
-      CreationalContext<ManagedBean> managedBeanCc = getCurrentManager().createCreationalContext(managedBeanBean);
-      ManagedBean managedBean = managedBeanBean.create(managedBeanCc);
+      ServiceBean serviceBean = getInstanceByType(ServiceBean.class);
+      ManagedBean managedBean = serviceBean.getManagedBean();
       assert managedBean.getPersistenceContext() != null : "Persistence context was not injected into bean";
-      assert managedBean.getPersistenceContext().isOpen() : "Persistence context not open injected into bean";
+      assert serviceBean.validateEntityManager();
    }
    
    @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })
@@ -88,7 +87,7 @@
       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";
+      assert managedBean.getPersistenceContext().getDelegate() != null : "Persistence context not deserialized correctly";
    }
    
    @Test(groups = { "beanLifecycle", "commonAnnotations", "integration" })