[webbeans-commits] Webbeans SVN: r1098 - in ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test: unit and 3 other directories.

Author: pete.muir(a)jboss.org Date: 2009-01-19 17:38:54 -0500 (Mon, 19 Jan 2009) New Revision: 1098 Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Tests.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/DeferredEventNotificationTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewSimpleBeanTest.java Log: tidy up tests Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Tests.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Tests.java 2009-01-19 22:37:47 UTC (rev 1097) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/examples/Tests.java 2009-01-19 22:38:54 UTC (rev 1098) @@ -8,7 +8,6 @@ import org.jboss.webbeans.bean.ProducerMethodBean; import org.jboss.webbeans.bean.SimpleBean; -import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.test.unit.AbstractTest; import org.testng.annotations.Test; @@ -18,31 +17,32 @@ public void testGameGenerator() throws Exception { setupGameGenerator(); - try + new RunInDependentContext() { - DependentContext.INSTANCE.setActive(true); - Game game1 = manager.getInstanceByType(Game.class); - Game game2 = manager.getInstanceByType(Game.class); - assert game1!=game2; - assert game1.getNumber()!=game2.getNumber(); - Generator gen1 = manager.getInstanceByType(Generator.class); - Generator gen2 = manager.getInstanceByType(Generator.class); - assert gen1.getRandom()!=null; - assert gen1.getRandom()==gen2.getRandom(); - } - finally - { - DependentContext.INSTANCE.setActive(false); - } + + @Override + protected void execute() throws Exception + { + Game game1 = manager.getInstanceByType(Game.class); + Game game2 = manager.getInstanceByType(Game.class); + assert game1!=game2; + assert game1.getNumber()!=game2.getNumber(); + Generator gen1 = manager.getInstanceByType(Generator.class); + Generator gen2 = manager.getInstanceByType(Generator.class); + assert gen1.getRandom()!=null; + assert gen1.getRandom()==gen2.getRandom(); + } + + }.run(); } private void setupGameGenerator() throws NoSuchMethodException { - SimpleBean<Game> gameBean = SimpleBean.of(Game.class, manager); - SimpleBean<Generator> generatorBean = SimpleBean.of(Generator.class, manager); + SimpleBean<Game> gameBean = createSimpleBean(Game.class); + SimpleBean<Generator> generatorBean = createSimpleBean(Generator.class); Method method = Generator.class.getDeclaredMethod("next"); method.setAccessible(true); - ProducerMethodBean<Integer> nextBean = ProducerMethodBean.of(method, generatorBean, manager); + ProducerMethodBean<Integer> nextBean = createProducerMethod(method, generatorBean); manager.addBean(gameBean); manager.addBean(generatorBean); @@ -55,48 +55,50 @@ manager.setEnabledDeploymentTypes(Arrays.asList(Standard.class, Production.class, Mock.class)); - try + new RunInDependentContext() { - DependentContext.INSTANCE.setActive(true); - TextTranslator tt2 = manager.getInstanceByType(TextTranslator.class); - assert "Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.".equals( tt2.translate("Hello world. How's tricks?") ); - } - finally - { - DependentContext.INSTANCE.setActive(false); - } + + @Override + protected void execute() throws Exception + { + TextTranslator tt2 = manager.getInstanceByType(TextTranslator.class); + assert "Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.".equals( tt2.translate("Hello world. How's tricks?") ); + } + + }.run(); } @Test public void testSentenceTranslator() throws Exception { setupTextTranslator(); - try + new RunInDependentContext() { - DependentContext.INSTANCE.setActive(true); - TextTranslator tt1 = manager.getInstanceByType(TextTranslator.class); - try + + @Override + protected void execute() throws Exception { - tt1.translate("hello world"); - assert false; + TextTranslator tt1 = manager.getInstanceByType(TextTranslator.class); + try + { + tt1.translate("hello world"); + assert false; + } + catch (UnsupportedOperationException uoe) + { + //expected + } } - catch (UnsupportedOperationException uoe) - { - //expected - } - } - finally - { - DependentContext.INSTANCE.setActive(false); - } + + }.run(); } private void setupTextTranslator() { - SimpleBean<SentenceParser> spBean = SimpleBean.of(SentenceParser.class, manager); - SimpleBean<SentenceTranslator> stBean = SimpleBean.of(SentenceTranslator.class, manager); - SimpleBean<MockSentenceTranslator> mstBean = SimpleBean.of(MockSentenceTranslator.class, manager); - SimpleBean<TextTranslator> ttBean = SimpleBean.of(TextTranslator.class, manager); + SimpleBean<SentenceParser> spBean = createSimpleBean(SentenceParser.class); + SimpleBean<SentenceTranslator> stBean = createSimpleBean(SentenceTranslator.class); + SimpleBean<MockSentenceTranslator> mstBean = createSimpleBean(MockSentenceTranslator.class); + SimpleBean<TextTranslator> ttBean = createSimpleBean(TextTranslator.class); manager.addBean(spBean); manager.addBean(stBean); Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java 2009-01-19 22:37:47 UTC (rev 1097) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/AbstractTest.java 2009-01-19 22:38:54 UTC (rev 1098) @@ -1,6 +1,8 @@ package org.jboss.webbeans.test.unit; import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; @@ -8,8 +10,13 @@ import javax.webbeans.Standard; import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.bean.AbstractClassBean; import org.jboss.webbeans.bean.EnterpriseBean; import org.jboss.webbeans.bean.NewEnterpriseBean; +import org.jboss.webbeans.bean.NewSimpleBean; +import org.jboss.webbeans.bean.ProducerFieldBean; +import org.jboss.webbeans.bean.ProducerMethodBean; +import org.jboss.webbeans.bean.SimpleBean; import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.test.mock.MockBootstrap; import org.jboss.webbeans.test.mock.MockEjbDescriptor; @@ -86,22 +93,42 @@ manager.getEjbDescriptorCache().add(MockEjbDescriptor.of(clazz)); return NewEnterpriseBean.of(clazz, manager); } + + protected <T> NewSimpleBean<T> createNewSimpleBean(Class<T> clazz) + { + return NewSimpleBean.of(clazz, manager); + } - protected static void activateDependentContext() + protected <T> SimpleBean<T> createSimpleBean(Class<T> clazz) { + return SimpleBean.of(clazz, manager); + } + + protected <T> ProducerMethodBean<T> createProducerMethod(Method method, AbstractClassBean<?> declaringBean) + { + return ProducerMethodBean.of(method, declaringBean, manager); + } + + protected <T> ProducerFieldBean<T> createProducerField(Field field, AbstractClassBean<?> declaringBean) + { + return ProducerFieldBean.of(field, declaringBean, manager); + } + + private static void activateDependentContext() + { DependentContext.INSTANCE.setActive(true); } - protected static void deactivateDependentContext() + private static void deactivateDependentContext() { DependentContext.INSTANCE.setActive(false); } - protected ManagerImpl deploy(Class<?>... classes) + protected void deployBeans(Class<?>... classes) { MockBootstrap bootstrap = new MockBootstrap(); bootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(classes)); bootstrap.boot(); - return bootstrap.getManager(); + manager = bootstrap.getManager(); } } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java 2009-01-19 22:37:47 UTC (rev 1097) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/bootstrap/BootstrapTest.java 2009-01-19 22:38:54 UTC (rev 1098) @@ -10,7 +10,6 @@ import org.jboss.webbeans.bean.EnterpriseBean; import org.jboss.webbeans.bean.ProducerMethodBean; import org.jboss.webbeans.bean.SimpleBean; -import org.jboss.webbeans.test.mock.MockWebBeanDiscovery; import org.jboss.webbeans.test.unit.AbstractTest; import org.testng.annotations.Test; @@ -19,8 +18,7 @@ @Test(groups="bootstrap") public void testSingleSimpleBean() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Tuna.class)); - webBeansBootstrap.boot(); + deployBeans(Tuna.class); List<Bean<?>> beans = manager.getBeans(); Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>(); for (Bean<?> bean : beans) @@ -36,8 +34,7 @@ @Test(groups="bootstrap") public void testSingleEnterpriseBean() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Hound.class)); - webBeansBootstrap.boot(); + deployBeans(Hound.class); List<Bean<?>> beans = manager.getBeans(); Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>(); for (Bean<?> bean : beans) @@ -53,8 +50,7 @@ @Test(groups="bootstrap") public void testMultipleSimpleBean() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Tuna.class, Salmon.class, SeaBass.class, Sole.class)); - webBeansBootstrap.boot(); + deployBeans(Tuna.class, Salmon.class, SeaBass.class, Sole.class); List<Bean<?>> beans = manager.getBeans(); Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>(); for (Bean<?> bean : beans) @@ -78,8 +74,7 @@ @Test(groups="bootstrap") public void testProducerMethodBean() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(TarantulaProducer.class)); - webBeansBootstrap.boot(); + deployBeans(TarantulaProducer.class); List<Bean<?>> beans = manager.getBeans(); Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>(); for (Bean<?> bean : beans) @@ -99,8 +94,7 @@ @Test(groups="bootstrap") public void testMultipleEnterpriseBean() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Hound.class, Elephant.class, Panther.class, Tiger.class)); - webBeansBootstrap.boot(); + deployBeans(Hound.class, Elephant.class, Panther.class, Tiger.class); List<Bean<?>> beans = manager.getBeans(); Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>(); for (Bean<?> bean : beans) @@ -124,8 +118,7 @@ @Test(groups="bootstrap") public void testMultipleEnterpriseAndSimpleBean() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class)); - webBeansBootstrap.boot(); + deployBeans(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class); List<Bean<?>> beans = manager.getBeans(); Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>(); for (Bean<?> bean : beans) @@ -157,8 +150,7 @@ @Test(groups="bootstrap") public void testRegisterProducerMethodBean() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(TarantulaProducer.class)); - webBeansBootstrap.boot(); + deployBeans(TarantulaProducer.class); Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>(); for (Bean<?> bean : manager.getBeans()) { @@ -178,8 +170,7 @@ @Test(groups="bootstrap") public void testRegisterMultipleEnterpriseAndSimpleBean() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class)); - webBeansBootstrap.boot(); + deployBeans(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class); Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>(); for (Bean<?> bean : manager.getBeans()) { @@ -210,15 +201,13 @@ @Test(groups="bootstrap", expectedExceptions=IllegalStateException.class) public void testDiscoverFails() { - webBeansBootstrap.setWebBeanDiscovery(null); - webBeansBootstrap.boot(); + deployBeans(); } @Test(groups="bootstrap") public void testDiscover() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class)); - webBeansBootstrap.boot(); + deployBeans(Hound.class, Elephant.class, Panther.class, Tiger.class, Tuna.class, Salmon.class, SeaBass.class, Sole.class); Map<Class<?>, Bean<?>> classes = new HashMap<Class<?>, Bean<?>>(); for (Bean<?> bean : manager.getBeans()) @@ -251,8 +240,7 @@ public void testInitializedEvent() { assert !InitializedObserver.observered; - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(InitializedObserver.class)); - webBeansBootstrap.boot(); + deployBeans(InitializedObserver.class); assert InitializedObserver.observered; } @@ -260,15 +248,13 @@ @Test(groups="bootstrap") public void testRequestContextActiveDuringInitializtionEvent() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(InitializedObserverWhichUsesRequestContext.class, Tuna.class)); - webBeansBootstrap.boot(); + deployBeans(InitializedObserverWhichUsesRequestContext.class, Tuna.class); } @Test(groups={"bootstrap", "broken"}) public void testApplicationContextActiveDuringInitializtionEvent() { - webBeansBootstrap.setWebBeanDiscovery(new MockWebBeanDiscovery(InitializedObserverWhichUsesApplicationContext.class, LadybirdSpider.class)); - webBeansBootstrap.boot(); + deployBeans(InitializedObserverWhichUsesApplicationContext.class, LadybirdSpider.class); } } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/DeferredEventNotificationTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/DeferredEventNotificationTest.java 2009-01-19 22:37:47 UTC (rev 1097) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/event/DeferredEventNotificationTest.java 2009-01-19 22:38:54 UTC (rev 1098) @@ -66,7 +66,7 @@ //annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); //AnnotatedClass<Tuna> annotatedItem = new SimpleAnnotatedClass<Tuna>(Tuna.class, annotations); // TODO This should test a real class - tuna = SimpleBean.of(Tuna.class, manager); + tuna = createSimpleBean(Tuna.class); om = new AnnotatedMethodImpl<Object>(AnObserver.class.getMethod("observe", new Class[] { Event.class }), AnnotatedClassImpl.of(AnObserver.class)); AnObserver observerInstance = new AnObserver(); Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewSimpleBeanTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewSimpleBeanTest.java 2009-01-19 22:37:47 UTC (rev 1097) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/unit/implementation/NewSimpleBeanTest.java 2009-01-19 22:38:54 UTC (rev 1098) @@ -16,9 +16,9 @@ @BeforeMethod public void initNewBean() { - wrappedSimpleBean = SimpleBean.of(WrappedSimpleBean.class, manager); + wrappedSimpleBean = createSimpleBean(WrappedSimpleBean.class); manager.addBean(wrappedSimpleBean); - newSimpleBean = NewSimpleBean.of(WrappedSimpleBean.class, manager); + newSimpleBean = createNewSimpleBean(WrappedSimpleBean.class); manager.addBean(newSimpleBean); }