(no commit message)

[utils] / support / cdi / src / test / java / org / wamblee / cdi / SimpleInjectorTest.java

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 f9e77a5deb116489c513ef017afb162b09267db7..7c61b2ffa6d70500325d658fdc69cd122e69a8ba 100644 (file)
--- a/support/cdi/src/test/java/org/wamblee/cdi/SimpleInjectorTest.java
+++ b/support/cdi/src/test/java/org/wamblee/cdi/SimpleInjectorTest.java
@@ -27,8 +27,9 @@ import org.junit.Before;
 import org.junit.Test;
 import org.wamblee.inject.Injector;
 import org.wamblee.inject.InjectorFactory;
-import org.wamblee.inject.InjectorFactoryBuilder;
+import org.wamblee.inject.InjectorBuilder;
 import org.wamblee.inject.SimpleInjector;
+import org.wamblee.test.cdi.BeanManagerSetup;
 import org.wamblee.test.jndi.StubInitialContextFactory;
 
 public class SimpleInjectorTest extends BaseTestFixture {
@@ -43,7 +44,7 @@ public class SimpleInjectorTest extends BaseTestFixture {
         StubInitialContextFactory.register();
         InitialContext ctx = new InitialContext();
         ctx.bind(BeanManagerLookup.BEAN_MANAGER_JNDI, setup.getBeanManager());
-        MySingleton.reset();        
+        MySingleton.reset();
     }
 
     @After
@@ -56,7 +57,8 @@ public class SimpleInjectorTest extends BaseTestFixture {
     @Test
     public void testGetSingleton() {
         MyPojo pojo = new MyPojo();
-        SimpleInjector injector = new SimpleInjector(new CdiInjectorFactory(BeanManagerLookup.lookup()));
+        SimpleInjector injector = new SimpleInjector(new CdiInjectorFactory(
+            BeanManagerLookup.lookup()));
         injector.inject(pojo);
 
         MySingleton obj = pojo.getSingleton();
@@ -82,37 +84,38 @@ public class SimpleInjectorTest extends BaseTestFixture {
             @Override
             public void inject(Object aComponent) {
                 MyPojo pojo2 = (MyPojo) aComponent;
-                pojo2.setSingleton(singleton); 
+                pojo2.setSingleton(singleton);
             }
         });
-        
+
         injector.inject(pojo);
-        // verify the custom injector was called. 
+        // verify the custom injector was called.
         assertSame(singleton, pojo.getSingleton());
     }
-    
+
     @RequestScoped
-    public static class Y { 
-        
+    public static class Y {
+
     }
-    public static class X { 
+
+    public static class X {
         @Inject
-        private Y y; 
-        
+        private Y y;
+
     }
-    
-    @Test 
-    public void testInjectStorage() throws Exception { 
-        X x = new X(); 
-        InjectorFactoryBuilder.setInjectorFactory(null);
-        InjectorFactoryBuilder.getInjector().inject(x);
+
+    @Test
+    public void testInjectStorage() throws Exception {
+        X x = new X();
+        InjectorBuilder.setInjectorFactory(null);
+        InjectorBuilder.getInjector().inject(x);
     }
-    
-    @Test 
-    public void testInjectStorage2() { 
-        X x = new X(); 
-        InjectorFactoryBuilder.setInjectorFactory(null);
-        InjectorFactoryBuilder.getInjector().inject(x);
+
+    @Test
+    public void testInjectStorage2() {
+        X x = new X();
+        InjectorBuilder.setInjectorFactory(null);
+        InjectorBuilder.getInjector().inject(x);
     }
-    
+
 }