[weld-commits] Weld SVN: r5422 - in cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests: lookup/injection/non/contextual and 1 other directory.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-01-11 15:55:08 -0500 (Mon, 11 Jan 2010)
New Revision: 5422

Modified:
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
   cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ProcessAnnotatedTypeObserver.java
Log:
fix an ordering problem, cleanup after ourselves

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java	2010-01-11 20:04:05 UTC (rev 5421)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java	2010-01-11 20:55:08 UTC (rev 5422)
@@ -173,9 +173,8 @@
    })
    public void testContextIsActiveWhenInvokingProducerMethod()
    {
-      Bean<Tarantula> tarantulaBean = getBeans(Tarantula.class).iterator().next();
-      CreationalContext<Tarantula> creationalContext = getCurrentManager().createCreationalContext(tarantulaBean);
-      Tarantula tarantula = tarantulaBean.create(creationalContext);
+      SpiderProducer.reset();
+      Tarantula tarantula = getInstanceByType(Tarantula.class,PET_LITERAL);
       assert tarantula != null;
       assert SpiderProducer.isDependentContextActive();
       SpiderProducer.reset();
@@ -189,6 +188,7 @@
       Tarantula.reset();
       getInstanceByType(Tarantula.class,TAME_LITERAL);
       assert Tarantula.isDependentContextActive();
+      SpiderProducer.reset();
    }
 
    @Test(groups = { "contexts", "disposalMethod" })

Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ProcessAnnotatedTypeObserver.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ProcessAnnotatedTypeObserver.java	2010-01-11 20:04:05 UTC (rev 5421)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ProcessAnnotatedTypeObserver.java	2010-01-11 20:55:08 UTC (rev 5422)
@@ -1,6 +1,7 @@
 package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual;
 
 import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeforeShutdown;
 import javax.enterprise.inject.spi.Extension;
 import javax.enterprise.inject.spi.ProcessAnnotatedType;
 
@@ -13,6 +14,16 @@
    private static ProcessAnnotatedType<TestTagHandler> tagHandlerEvent = null;
    private static ProcessAnnotatedType<Farm> jsfManagedBeanEvent = null;
    
+   public void cleanup(@Observes BeforeShutdown shutdown)
+   {
+      servletEvent = null;
+      listenerEvent = null;
+      filterEvent = null;
+      tagLibraryListenerEvent = null;
+      tagHandlerEvent = null;
+      jsfManagedBeanEvent = null;
+   }
+   
    public void observeServlet(@Observes ProcessAnnotatedType<TestServlet> event) {
       servletEvent = event;
    }