svn commit: r1353278 - in /openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb: OpenEJBInjectionEnricher.java TestObserver.java

[rmannibucau]

Author: rmannibucau
Date: Sun Jun 24 14:44:50 2012
New Revision: 1353278

URL: http://svn.apache.org/viewvc?rev=1353278&view=rev
Log:
OPENEJB-1843 @Before needs enrichment

Modified:
    
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java
    
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/TestObserver.java

Modified: 
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java?rev=1353278&r1=1353277&r2=1353278&view=diff
==============================================================================
--- 
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java
 (original)
+++ 
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBInjectionEnricher.java
 Sun Jun 24 14:44:50 2012
@@ -33,7 +33,10 @@ import org.jboss.arquillian.container.sp
 import org.jboss.arquillian.container.spi.context.annotation.DeploymentScoped;
 import org.jboss.arquillian.core.api.Instance;
 import org.jboss.arquillian.core.api.annotation.Inject;
+import org.jboss.arquillian.core.api.annotation.Observes;
+import org.jboss.arquillian.core.spi.EventContext;
 import org.jboss.arquillian.test.spi.TestEnricher;
+import org.jboss.arquillian.test.spi.event.suite.SuiteEvent;
 
 public class OpenEJBInjectionEnricher implements TestEnricher {
     @Inject
@@ -44,6 +47,10 @@ public class OpenEJBInjectionEnricher im
     @ContainerScoped
     private Instance<ContainerSystem> containerSystem;
 
+    public void createSuiteContext(@Observes(precedence=100) 
EventContext<SuiteEvent> context) {
+
+    }
+
     @Override
     public void enrich(final Object testInstance) {
         final AppContext ctx = appContext.get();

Modified: 
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/TestObserver.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/TestObserver.java?rev=1353278&r1=1353277&r2=1353278&view=diff
==============================================================================
--- 
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/TestObserver.java
 (original)
+++ 
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/TestObserver.java
 Sun Jun 24 14:44:50 2012
@@ -30,6 +30,7 @@ import org.jboss.arquillian.test.spi.eve
 import org.jboss.arquillian.test.spi.event.suite.Before;
 import org.jboss.arquillian.test.spi.event.suite.BeforeClass;
 import org.jboss.arquillian.test.spi.event.suite.ClassLifecycleEvent;
+import org.jboss.arquillian.test.spi.event.suite.LifecycleEvent;
 import org.jboss.arquillian.test.spi.event.suite.Test;
 import org.jboss.arquillian.test.spi.event.suite.TestLifecycleEvent;
 
@@ -73,19 +74,22 @@ public class TestObserver {
         });
     }
 
-    public void on(@Observes(precedence = 200) final BeforeClass event) throws 
Throwable {
-        setClassLoader(event.getTestClass().getJavaClass(), new 
CLassEventRunnable(event));
+    // after enrichement
+    public void on(@Observes(precedence = -1) Before event) throws Throwable {
+        setClassLoader(event.getTestClass().getJavaClass(), new 
LifeCycleEventRunnable(event));
     }
 
-    public void on(@Observes(precedence = 200) AfterClass event) throws 
Throwable {
-        setClassLoader(event.getTestClass().getJavaClass(), new 
CLassEventRunnable(event));
+    public void on(@Observes(precedence = 200) After event) throws Throwable {
+        setClassLoader(event.getTestClass().getJavaClass(), new 
LifeCycleEventRunnable(event));
     }
 
-    public void on(@Observes(precedence = 200) Before event) throws Throwable {
+    // shouldn't be needed
+    public void on(@Observes(precedence = 200) final BeforeClass event) throws 
Throwable {
         setClassLoader(event.getTestClass().getJavaClass(), new 
LifeCycleEventRunnable(event));
     }
 
-    public void on(@Observes(precedence = 200) After event) throws Throwable {
+    // shouldn't be needed
+    public void on(@Observes(precedence = 200) AfterClass event) throws 
Throwable {
         setClassLoader(event.getTestClass().getJavaClass(), new 
LifeCycleEventRunnable(event));
     }
 
@@ -94,26 +98,9 @@ public class TestObserver {
     }
 
     private static class LifeCycleEventRunnable implements Runnable {
-        private final TestLifecycleEvent event;
-
-        public LifeCycleEventRunnable(final TestLifecycleEvent e) {
-            event = e;
-        }
-
-        @Override
-        public void run() {
-            try {
-                event.getExecutor().invoke();
-            } catch (Throwable throwable) {
-                throw new RuntimeException(throwable);
-            }
-        }
-    }
-
-    private static class CLassEventRunnable implements Runnable {
-        private final ClassLifecycleEvent event;
+        private final LifecycleEvent event;
 
-        public CLassEventRunnable(final ClassLifecycleEvent e) {
+        public LifeCycleEventRunnable(final LifecycleEvent e) {
             event = e;
         }