X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fcdi%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fcdi%2FSimpleInjectorTest.java;h=d7df81aae2aefedccf4f145cf0e3af009e8195c3;hb=fb96777729647db6c767cf7b1e45ab974110b2f6;hp=44c2eda222aa1ef8aec671f52c59dbbdbacdfcc8;hpb=5ed0d716f514be541d887d0cff21cecccacf3aa9;p=utils

diff --git a/support/cdi/src/test/java/org/wamblee/cdi/SimpleInjectorTest.java b/support/cdi/src/test/java/org/wamblee/cdi/SimpleInjectorTest.java
index 44c2eda2..d7df81aa 100644
--- a/support/cdi/src/test/java/org/wamblee/cdi/SimpleInjectorTest.java
+++ b/support/cdi/src/test/java/org/wamblee/cdi/SimpleInjectorTest.java
@@ -23,31 +23,37 @@ import javax.naming.InitialContext;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.wamblee.support.jndi.StubInitialContextFactory;
+import org.wamblee.inject.Injector;
+import org.wamblee.inject.InjectorFactory;
+import org.wamblee.inject.SimpleInjector;
+import org.wamblee.test.jndi.StubInitialContextFactory;
 
-public class SimpleInjectorTest {
+public class SimpleInjectorTest extends BaseTestFixture {
 
     private BeanManagerSetup setup;
 
     @Before
     public void setUp() throws Exception {
+        super.setUp();
         setup = new BeanManagerSetup();
         setup.initialize();
         StubInitialContextFactory.register();
         InitialContext ctx = new InitialContext();
         ctx.bind(BeanManagerLookup.BEAN_MANAGER_JNDI, setup.getBeanManager());
+        MySingleton.reset();        
     }
 
     @After
-    public void tearDown() {
+    public void tearDown() throws Exception {
         StubInitialContextFactory.unregister();
         setup.shutdown();
+        super.tearDown();
     }
 
     @Test
     public void testGetSingleton() {
         MyPojo pojo = new MyPojo();
-        SimpleInjector injector = new SimpleInjector();
+        SimpleInjector injector = new SimpleInjector(new CdiInjectorFactory(BeanManagerLookup.lookup()));
         injector.inject(pojo);
 
         MySingleton obj = pojo.getSingleton();