git://wamblee.org
/
utils
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7f6f939
)
(no commit message)
author
erik
<erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Wed, 28 Jul 2010 18:22:25 +0000
(18:22 +0000)
committer
erik
<erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Wed, 28 Jul 2010 18:22:25 +0000
(18:22 +0000)
support/cdi/src/test/java/org/wamblee/cdi/InjectorBuilderTest.java
[moved from
support/cdi/src/test/java/org/wamblee/cdi/InjectorFactoryBuilderTest.java
with 88% similarity]
patch
|
blob
|
history
support/cdi/src/test/java/org/wamblee/cdi/SimpleInjectorTest.java
patch
|
blob
|
history
diff --git
a/support/cdi/src/test/java/org/wamblee/cdi/InjectorFactoryBuilderTest.java
b/support/cdi/src/test/java/org/wamblee/cdi/InjectorBuilderTest.java
similarity index 88%
rename from
support/cdi/src/test/java/org/wamblee/cdi/InjectorFactoryBuilderTest.java
rename to
support/cdi/src/test/java/org/wamblee/cdi/InjectorBuilderTest.java
index 5fdc111e74bc82e74335027acf8f87660481c33f..dd1210fbf5b20b89a2ca0dee52fad97a19177ccb 100644
(file)
--- a/
support/cdi/src/test/java/org/wamblee/cdi/InjectorFactoryBuilderTest.java
+++ b/
support/cdi/src/test/java/org/wamblee/cdi/InjectorBuilderTest.java
@@
-25,10
+25,10
@@
import org.junit.Test;
import org.wamblee.cdi.SimpleInjectorTest.X;
import org.wamblee.cdi.SimpleInjectorTest.Y;
import org.wamblee.inject.InjectorFactory;
import org.wamblee.cdi.SimpleInjectorTest.X;
import org.wamblee.cdi.SimpleInjectorTest.Y;
import org.wamblee.inject.InjectorFactory;
-import org.wamblee.inject.Injector
Factory
Builder;
+import org.wamblee.inject.InjectorBuilder;
import org.wamblee.test.jndi.StubInitialContextFactory;
import org.wamblee.test.jndi.StubInitialContextFactory;
-public class Injector
Factory
BuilderTest extends BaseTestFixture {
+public class InjectorBuilderTest extends BaseTestFixture {
@Test
@Test
@@
-39,7
+39,7
@@
public class InjectorFactoryBuilderTest extends BaseTestFixture {
InitialContext ctx = new InitialContext();
ctx.bind(BeanManagerLookup.BEAN_MANAGER_JNDI, setup.getBeanManager());
try {
InitialContext ctx = new InitialContext();
ctx.bind(BeanManagerLookup.BEAN_MANAGER_JNDI, setup.getBeanManager());
try {
- InjectorFactory factory = Injector
Factory
Builder.getInjectorFactory();
+ InjectorFactory factory = InjectorBuilder.getInjectorFactory();
assertTrue(factory instanceof CdiInjectorFactory);
} finally {
setup.shutdown();
assertTrue(factory instanceof CdiInjectorFactory);
} finally {
setup.shutdown();
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..93f260e2d3f170ba889a83640b9919820e577bed 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,7
+27,7
@@
import org.junit.Before;
import org.junit.Test;
import org.wamblee.inject.Injector;
import org.wamblee.inject.InjectorFactory;
import org.junit.Test;
import org.wamblee.inject.Injector;
import org.wamblee.inject.InjectorFactory;
-import org.wamblee.inject.Injector
Factory
Builder;
+import org.wamblee.inject.InjectorBuilder;
import org.wamblee.inject.SimpleInjector;
import org.wamblee.test.jndi.StubInitialContextFactory;
import org.wamblee.inject.SimpleInjector;
import org.wamblee.test.jndi.StubInitialContextFactory;
@@
-104,15
+104,15
@@
public class SimpleInjectorTest extends BaseTestFixture {
@Test
public void testInjectStorage() throws Exception {
X x = new X();
@Test
public void testInjectStorage() throws Exception {
X x = new X();
- Injector
Factory
Builder.setInjectorFactory(null);
- Injector
Factory
Builder.getInjector().inject(x);
+ InjectorBuilder.setInjectorFactory(null);
+ InjectorBuilder.getInjector().inject(x);
}
@Test
public void testInjectStorage2() {
X x = new X();
}
@Test
public void testInjectStorage2() {
X x = new X();
- Injector
Factory
Builder.setInjectorFactory(null);
- Injector
Factory
Builder.getInjector().inject(x);
+ InjectorBuilder.setInjectorFactory(null);
+ InjectorBuilder.getInjector().inject(x);
}
}
}
}