[jboss-svn-commits] JBoss Common SVN: r4073 - in arquillian/trunk/container-weld-embedded: src/main/java/org/jboss/arquillian/weld and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: aslak
Date: 2010-02-27 19:24:24 -0500 (Sat, 27 Feb 2010)
New Revision: 4073

Modified:
   arquillian/trunk/container-weld-embedded/pom.xml
   arquillian/trunk/container-weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSETestEnricher.java
Log:
ARQ-54 Changed to extend the common cdi test enricher


Modified: arquillian/trunk/container-weld-embedded/pom.xml
===================================================================
--- arquillian/trunk/container-weld-embedded/pom.xml	2010-02-28 00:17:10 UTC (rev 4072)
+++ arquillian/trunk/container-weld-embedded/pom.xml	2010-02-28 00:24:24 UTC (rev 4073)
@@ -53,6 +53,12 @@
          <artifactId>shrinkwrap-impl-base</artifactId>
       </dependency>
 
+      <dependency>
+         <groupId>org.jboss.arquillian</groupId>
+         <artifactId>arquillian-testenricher-cdi</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+
       <!-- 
     org.jboss.weld
      -->

Modified: arquillian/trunk/container-weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSETestEnricher.java
===================================================================
--- arquillian/trunk/container-weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSETestEnricher.java	2010-02-28 00:17:10 UTC (rev 4072)
+++ arquillian/trunk/container-weld-embedded/src/main/java/org/jboss/arquillian/weld/WeldSETestEnricher.java	2010-02-28 00:24:24 UTC (rev 4073)
@@ -16,12 +16,10 @@
  */
 package org.jboss.arquillian.weld;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionTarget;
+import javax.enterprise.inject.spi.BeanManager;
 
-import org.jboss.arquillian.spi.TestEnricher;
+import org.jboss.arquillian.testenricher.cdi.CDIInjectionEnricher;
 import org.jboss.arquillian.weld.WeldSEContainer.WeldHolder;
-import org.jboss.weld.manager.api.WeldManager;
 
 /**
  * WeldSETestEnricher
@@ -29,22 +27,16 @@
  * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
  * @version $Revision: $
  */
-public class WeldSETestEnricher implements TestEnricher
+public class WeldSETestEnricher extends CDIInjectionEnricher
 {
-   @SuppressWarnings("unchecked")
    @Override
-   public void enrich(Object testCase)
+   protected BeanManager lookupBeanManager()
    {
       WeldHolder holder = WeldSEContainer.WELD_MANAGER.get();
       if (holder != null)
       {
-         WeldManager manager = holder.getManager();
-         CreationalContext<Object> creationalContext = manager.createCreationalContext(null);
-         InjectionTarget<Object> injectionTarget = (InjectionTarget<Object>) manager
-               .createInjectionTarget(
-                     manager.createAnnotatedType(testCase.getClass()));
-         
-         injectionTarget.inject(testCase, creationalContext);
+         return holder.getManager();
       }
+      return null;
    }
 }