Author: pete.muir(a)jboss.org Date: 2009-09-22 07:00:26 -0400 (Tue, 22 Sep 2009) New Revision: 3718 Added: extensions/trunk/se/src/test/resources/META-INF/services/ extensions/trunk/se/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension Modified: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ObserverTestBean.java Log: Fix test Modified: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java =================================================================== --- extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java 2009-09-22 10:52:17 UTC (rev 3717) +++ extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/StartMainTest.java 2009-09-22 11:00:26 UTC (rev 3718) @@ -88,15 +88,13 @@ @Test public void testObservers() { + ObserverTestBean.reset(); + BeanManager manager = new StartMain(ARGS_EMPTY).go(); - manager.fireEvent(new CustomEvent()); - - ObserverTestBean observerTestBean = WebBeansManagerUtils.getInstanceByType(manager, ObserverTestBean.class); - Assert.assertNotNull(observerTestBean); - Assert.assertTrue(observerTestBean.isCustomObserved()); - Assert.assertTrue(observerTestBean.isBuiltInObserved()); - + + Assert.assertTrue(ObserverTestBean.isBuiltInObserved()); + Assert.assertTrue(ObserverTestBean.isCustomObserved()); } private void shutdownManager(BeanManager manager) Modified: extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ObserverTestBean.java =================================================================== --- extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ObserverTestBean.java 2009-09-22 10:52:17 UTC (rev 3717) +++ extensions/trunk/se/src/test/java/org/jboss/webbeans/environment/se/test/beans/ObserverTestBean.java 2009-09-22 11:00:26 UTC (rev 3718) @@ -19,18 +19,18 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterDeploymentValidation; +import javax.enterprise.inject.spi.Extension; /** * Tests the observing of both built-in and application-specific events. * * @author Peter Royle */ -@ApplicationScoped -public class ObserverTestBean +public class ObserverTestBean implements Extension { - private boolean builtInObserved = false; - private boolean customObserved = false; + private static boolean builtInObserved = false; + private static boolean customObserved = false; public ObserverTestBean() { @@ -38,19 +38,24 @@ public void observeBuiltInEvent(@Observes AfterDeploymentValidation after) { - this.builtInObserved = true; + builtInObserved = true; } public void observeCustomEvent(@Observes CustomEvent event) { - this.customObserved = true; - + customObserved = true; } + + public static void reset() + { + customObserved = false; + builtInObserved = false; + } /** * @return the observed */ - public boolean isBuiltInObserved() + public static boolean isBuiltInObserved() { return builtInObserved; } @@ -58,7 +63,7 @@ /** * @return */ - public boolean isCustomObserved() + public static boolean isCustomObserved() { return customObserved; } Added: extensions/trunk/se/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension =================================================================== --- extensions/trunk/se/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension (rev 0) +++ extensions/trunk/se/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2009-09-22 11:00:26 UTC (rev 3718) @@ -0,0 +1 @@ +org.jboss.webbeans.environment.se.test.beans.ObserverTestBean