X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fcdi%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fcdi%2FBeanManagerLookupTest.java;h=2889a2fabfdc6dfb0ab6fb8cb5da9bc65c84d9c6;hb=d76c1c5b113e82739f8e0ae92288ba120d747111;hp=c1fd7cb18b1ce877779c03f11b6086a7ad261ac6;hpb=f72c6154065a85e59e1b494927a355f869faf8c6;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 c1fd7cb1..2889a2fa 100644 --- a/support/cdi/src/test/java/org/wamblee/cdi/BeanManagerLookupTest.java +++ b/support/cdi/src/test/java/org/wamblee/cdi/BeanManagerLookupTest.java @@ -16,23 +16,22 @@ package org.wamblee.cdi; import static junit.framework.Assert.*; +import static org.mockito.Mockito.*; import javax.enterprise.inject.spi.BeanManager; import javax.naming.InitialContext; import org.junit.Test; -import org.wamblee.support.jndi.StubInitialContextFactory; - -import static org.mockito.Mockito.*; +import org.wamblee.test.jndi.StubInitialContextFactory; -public class BeanManagerLookupTest { +public class BeanManagerLookupTest extends BaseTestFixture { @Test public void testLookupInJndi() throws Exception { BeanManagerSetup setup = new BeanManagerSetup(); setup.initialize(); StubInitialContextFactory.register(); - InitialContext ctx = new InitialContext(); + InitialContext ctx = new InitialContext(); ctx.bind(BeanManagerLookup.BEAN_MANAGER_JNDI, setup.getBeanManager()); try { assertSame(setup.getBeanManager(), BeanManagerLookup.lookup()); @@ -41,13 +40,13 @@ public class BeanManagerLookupTest { StubInitialContextFactory.unregister(); } } - + @Test - public void testWithJndiButWithOverride() throws Exception { + public void testWithJndiButWithOverride() throws Exception { BeanManagerSetup setup = new BeanManagerSetup(); setup.initialize(); StubInitialContextFactory.register(); - InitialContext ctx = new InitialContext(); + InitialContext ctx = new InitialContext(); ctx.bind(BeanManagerLookup.BEAN_MANAGER_JNDI, setup.getBeanManager()); try { BeanManager override = mock(BeanManager.class); @@ -58,9 +57,9 @@ public class BeanManagerLookupTest { StubInitialContextFactory.unregister(); } } - + @Test - public void testNoJndiButWithOverride() throws Exception { + public void testNoJndiButWithOverride() throws Exception { BeanManager override = mock(BeanManager.class); BeanManagerLookup.setBeanManager(override); assertSame(override, BeanManagerLookup.lookup());