[weld-commits] Weld SVN: r4582 - core/trunk/tests/src/main/java/org/jboss/weld/test.
Author: pete.muir(a)jboss.org
Date: 2009-11-02 19:12:53 -0500 (Mon, 02 Nov 2009)
New Revision: 4582
Modified:
core/trunk/tests/src/main/java/org/jboss/weld/test/AbstractWeldTest.java
Log:
use BeanManagerLocator
Modified: core/trunk/tests/src/main/java/org/jboss/weld/test/AbstractWeldTest.java
===================================================================
--- core/trunk/tests/src/main/java/org/jboss/weld/test/AbstractWeldTest.java 2009-11-03
00:09:55 UTC (rev 4581)
+++ core/trunk/tests/src/main/java/org/jboss/weld/test/AbstractWeldTest.java 2009-11-03
00:12:53 UTC (rev 4582)
@@ -21,9 +21,7 @@
import org.jboss.testharness.AbstractTest;
import org.jboss.testharness.impl.runner.servlet.ServletTestRunner;
import org.jboss.weld.BeanManagerImpl;
-import org.jboss.weld.mock.MockServletContext;
import org.jboss.weld.mock.el.EL;
-import org.jboss.weld.servlet.ServletHelper;
import org.jboss.weld.util.collections.EnumerationList;
import org.testng.ITestContext;
import org.testng.annotations.AfterClass;
@@ -57,10 +55,6 @@
{
servletContext = ServletTestRunner.getCurrentServletContext();
}
- else
- {
- servletContext = new MockServletContext("");
- }
}
@@ -133,7 +127,7 @@
protected BeanManagerImpl getCurrentManager()
{
- return ServletHelper.getModuleBeanManager(servletContext);
+ return BeanManagerLocator.INSTANCE.locate();
}
public boolean isExceptionInHierarchy(Throwable exception, Class<? extends
Throwable> expectedException )