X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fcdi%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fcdi%2FBeanManagerLookupTest.java;h=f73f706626fbed73464a8a28c5d5c1a26ba82d09;hb=1baf903d22ec384ea7d730889c2b0fd5f087a0e5;hp=8115ac49825c438bdefc021c649f1cd452f6a6bb;hpb=8fee9047edd0fe3acc5643aeea20cdc89a684b48;p=utils

diff --git a/support/cdi/src/test/java/org/wamblee/cdi/BeanManagerLookupTest.java b/support/cdi/src/test/java/org/wamblee/cdi/BeanManagerLookupTest.java
index 8115ac49..f73f7066 100644
--- a/support/cdi/src/test/java/org/wamblee/cdi/BeanManagerLookupTest.java
+++ b/support/cdi/src/test/java/org/wamblee/cdi/BeanManagerLookupTest.java
@@ -16,6 +16,7 @@
 package org.wamblee.cdi;
 
 import static junit.framework.Assert.*;
+import static org.mockito.Mockito.*;
 
 import javax.enterprise.inject.spi.BeanManager;
 import javax.naming.InitialContext;
@@ -23,8 +24,8 @@ import javax.naming.InitialContext;
 import org.junit.Test;
 import org.wamblee.support.jndi.StubInitialContextFactory;
 
-public class BeanManagerLookupTest {
-
+public class BeanManagerLookupTest extends BaseTestFixture {
+  
     @Test
     public void testLookupInJndi() throws Exception {
         BeanManagerSetup setup = new BeanManagerSetup();
@@ -33,12 +34,34 @@ public class BeanManagerLookupTest {
         InitialContext ctx = new InitialContext(); 
         ctx.bind(BeanManagerLookup.BEAN_MANAGER_JNDI, setup.getBeanManager());
         try {
-            ctx = new InitialContext(); 
-            BeanManager manager = (BeanManager) ctx.lookup(BeanManagerLookup.BEAN_MANAGER_JNDI);
-            assertSame(setup.getBeanManager(), manager);
+            assertSame(setup.getBeanManager(), BeanManagerLookup.lookup());
         } finally {
             setup.shutdown();
             StubInitialContextFactory.unregister();
         }
     }
+    
+    @Test
+    public void testWithJndiButWithOverride() throws Exception { 
+        BeanManagerSetup setup = new BeanManagerSetup();
+        setup.initialize();
+        StubInitialContextFactory.register();
+        InitialContext ctx = new InitialContext(); 
+        ctx.bind(BeanManagerLookup.BEAN_MANAGER_JNDI, setup.getBeanManager());
+        try {
+            BeanManager override = mock(BeanManager.class);
+            BeanManagerLookup.setBeanManager(override);
+            assertSame(override, BeanManagerLookup.lookup());
+        } finally {
+            setup.shutdown();
+            StubInitialContextFactory.unregister();
+        }
+    }
+    
+    @Test
+    public void testNoJndiButWithOverride() throws Exception { 
+        BeanManager override = mock(BeanManager.class);
+        BeanManagerLookup.setBeanManager(override);
+        assertSame(override, BeanManagerLookup.lookup());
+    }
 }