[webbeans-commits] Webbeans SVN: r3225 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-07-25 14:42:46 -0400 (Sat, 25 Jul 2009)
New Revision: 3225

Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
Log:
fixes to test to comply with spec (same cc used for create and destroy)

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java	2009-07-25 18:36:42 UTC (rev 3224)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java	2009-07-25 18:42:46 UTC (rev 3225)
@@ -187,7 +187,7 @@
       assert OrderProcessor.postConstructCalled;
    }
    
-   @Test(groups = "ri-broken")
+   @Test
    @SpecAssertion(section = "4.2", id = "bbb")
    public void testSubClassInheritsPreDestroyOnSuperclass() throws Exception
    {
@@ -195,20 +195,20 @@
       assert getBeans(DirectOrderProcessorLocal.class).size() == 1;
       Bean<DirectOrderProcessorLocal> bean = getBeans(DirectOrderProcessorLocal.class).iterator().next();
       CreationalContext<DirectOrderProcessorLocal> creationalContext = getCurrentManager().createCreationalContext(bean);
-      DirectOrderProcessorLocal instance = getInstanceByType(DirectOrderProcessorLocal.class);
+      DirectOrderProcessorLocal instance = bean.create(creationalContext);
       bean.destroy(instance, creationalContext);
       assert OrderProcessor.preDestroyCalled;
    }
    
-   @Test(groups = "ri-broken")
+   @Test
    @SpecAssertion(section = "4.2", id = "bbd")
    public void testIndirectSubClassInheritsPreDestroyOnSuperclass() throws Exception
    {
       OrderProcessor.preDestroyCalled = false;
-      assert getBeans(IndirectOrderProcessor.class).size() == 1;
-      Bean<IndirectOrderProcessor> bean = getBeans(IndirectOrderProcessor.class).iterator().next();
-      CreationalContext<IndirectOrderProcessor> creationalContext = getCurrentManager().createCreationalContext(bean);
-      IndirectOrderProcessor instance = getInstanceByType(IndirectOrderProcessor.class);
+      assert getBeans(OrderProcessorLocal.class).size() == 1;
+      Bean<OrderProcessorLocal> bean = getBeans(OrderProcessorLocal.class).iterator().next();
+      CreationalContext<OrderProcessorLocal> creationalContext = getCurrentManager().createCreationalContext(bean);
+      OrderProcessorLocal instance = bean.create(creationalContext);
       bean.destroy(instance, creationalContext);
       assert OrderProcessor.preDestroyCalled;
    }