Merge pull request #809 from caelum/restartingWeldContainerEachTest

trying to fix Travis instability
caelum · Sep 23, 2014 · 3678824 · 3678824
2 parents f3c2541 + 96b934a
commit 3678824
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/WeldJunitRunner.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/WeldJunitRunner.java
@@ -16,8 +16,9 @@
  */
 package br.com.caelum.vraptor;
 
+import javax.enterprise.inject.spi.CDI;
+
 import org.jboss.weld.environment.se.Weld;
-import org.jboss.weld.environment.se.WeldContainer;
 import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.BlockJUnit4ClassRunner;
 import org.junit.runners.model.FrameworkMethod;
@@ -31,14 +32,10 @@
 public class WeldJunitRunner extends BlockJUnit4ClassRunner {
 
 	private Class<?> clazz;
-	private static WeldContainer weldContainer;
 
-	static {
-		weldContainer = new Weld().initialize();
-	}
-
 	public WeldJunitRunner(Class<?> testClass) throws InitializationError {
 		super(testClass);
+		new Weld().initialize();
 		this.clazz = testClass;
 	}
 
@@ -47,17 +44,14 @@ public WeldJunitRunner(Class<?> testClass) throws InitializationError {
 	 */
 	@Override
 	protected Object createTest() throws Exception {
-		return currentInstance(clazz);
+		return CDI.current().select(clazz).get();
 	}
 
 	@Override
 	protected void runChild(FrameworkMethod method, RunNotifier notifier) {
-		currentInstance(Contexts.class).startRequestScope();
+		Contexts contexts = CDI.current().select(Contexts.class).get();
+		contexts.startRequestScope();
 		super.runChild(method, notifier);
-		currentInstance(Contexts.class).stopRequestScope();
-	}
-
-	private <T> T currentInstance(Class<T> clazz) {
-		return weldContainer.instance().select(clazz).get();
+		contexts.stopRequestScope();
 	}
 }
diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/ioc/MockRequestHandlerObserver.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/ioc/MockRequestHandlerObserver.java
@@ -15,6 +15,7 @@
  */
 package br.com.caelum.vraptor.ioc;
 
+import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Event;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.Specializes;
@@ -30,7 +31,7 @@
 import br.com.caelum.vraptor.http.UrlToControllerTranslator;
 import br.com.caelum.vraptor.observer.RequestHandlerObserver;
 
-@Specializes
+@Specializes @ApplicationScoped
 class MockRequestHandlerObserver extends RequestHandlerObserver{
 	private boolean vraptorStackCalled;
 

diff --git a/vraptor-core/src/test/java/br/com/caelum/vraptor/ioc/cdi/Contexts.java b/vraptor-core/src/test/java/br/com/caelum/vraptor/ioc/cdi/Contexts.java
@@ -18,6 +18,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
 import org.jboss.weld.context.AbstractSharedContext;
@@ -27,6 +28,7 @@
 import org.jboss.weld.context.bound.BoundSessionContext;
 import org.jboss.weld.context.bound.MutableBoundRequest;
 
+@ApplicationScoped
 public class Contexts {
 
 	@Inject