[webbeans-commits] Webbeans SVN: r188 - in ri/trunk/webbeans-ri: src/main/java/org/jboss/webbeans/event and 2 other directories.

Author: pete.muir(a)jboss.org Date: 2008-10-27 20:54:40 -0400 (Mon, 27 Oct 2008) New Revision: 188 Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EventBeanModel.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DependentContextTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBeanModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventObserverTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java ri/trunk/webbeans-ri/testng.xml Log: Enable event tests Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java 2008-10-28 00:41:01 UTC (rev 187) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java 2008-10-28 00:54:40 UTC (rev 188) @@ -1,8 +1,6 @@ package org.jboss.webbeans.event; import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Arrays; import java.util.Collection; @@ -79,7 +77,7 @@ eventBindings.addAll(this.getBindingTypes()); addAnnotationBindings(eventBindings, bindings); Type[] observerTypeArguments = Reflections.getActualTypeArguements(observer.getClass()); - webBeansManager.addObserver(observer, (Class<T>)observerTypeArguments[0], bindings); + webBeansManager.addObserver(observer, (Class<T>) observerTypeArguments[0], bindings); } /** Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EventBeanModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EventBeanModel.java 2008-10-28 00:41:01 UTC (rev 187) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EventBeanModel.java 2008-10-28 00:54:40 UTC (rev 188) @@ -116,6 +116,12 @@ } @Override + protected void checkDeploymentType() + { + // No - op + } + + @Override protected void initName() { // No name per 7.4 Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java 2008-10-28 00:41:01 UTC (rev 187) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java 2008-10-28 00:54:40 UTC (rev 188) @@ -55,7 +55,7 @@ * {@link org.jboss.webbeans.event.DeferredEventNotification#beforeCompletion()} * . */ - @Test(groups="eventbus") + @Test(groups="deferredEvent") public final void testBeforeCompletion() throws Exception { // When the transaction is committed, the beforeCompletion() method is Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DependentContextTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DependentContextTest.java 2008-10-28 00:41:01 UTC (rev 187) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DependentContextTest.java 2008-10-28 00:54:40 UTC (rev 188) @@ -23,7 +23,7 @@ assert false; } - @Test(groups={"contexts", "eventbus"}) @SpecAssertion(section="8.3") + @Test(groups={"contexts", "observerMethod"}) @SpecAssertion(section="8.3") public void testInstanceUsedForObserverMethodNotShared() { assert false; @@ -53,7 +53,7 @@ assert false; } - @Test(groups={"contexts", "eventbus"}) @SpecAssertion(section="8.3") + @Test(groups={"contexts", "observerMethod"}) @SpecAssertion(section="8.3") public void testContextIsActiveWhenInvokingObserverMethod() { assert false; @@ -138,7 +138,7 @@ assert false; } - @Test(groups={"contexts", "eventbus"}) @SpecAssertion(section="8.3") + @Test(groups={"contexts", "observerMethod"}) @SpecAssertion(section="8.3") public void testDependentsDestroyedWhenObserverMethodEvaluationCompletes() { assert false; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBeanModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBeanModelTest.java 2008-10-28 00:41:01 UTC (rev 187) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBeanModelTest.java 2008-10-28 00:54:40 UTC (rev 188) @@ -51,7 +51,7 @@ /** * The name should always be null since this type of bean is not allowed to have a name. */ - @Test(groups = "eventbus") + @Test(groups = "event") public void testName() { assert eventBeanModel.getName() == null; @@ -60,7 +60,7 @@ /** * The scope type should always be @Dependent */ - @Test(groups = "eventbus") + @Test(groups = "event") public void testScopeType() { assert eventBeanModel.getScopeType().equals(Dependent.class); @@ -69,13 +69,13 @@ /** * The deployment type should always be @Standard */ - @Test(groups = "eventbus") + @Test(groups = "event") public void testDeploymentType() { assert eventBeanModel.getDeploymentType().equals(Standard.class); } - @Test(groups = "eventbus") + @Test(groups = "event") public void testApiTypes() { Set<Class<?>> apis = eventBeanModel.getApiTypes(); @@ -86,7 +86,7 @@ } } - @Test(groups = "eventbus") + @Test(groups = "event") public void testConstructor() { BeanConstructor<EventImpl<DangerCall>> constructor = eventBeanModel.getConstructor(); Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java 2008-10-28 00:41:01 UTC (rev 187) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java 2008-10-28 00:54:40 UTC (rev 188) @@ -26,7 +26,7 @@ * @author David Allen * */ -@SpecVersion("20081024-PDR") +@SpecVersion("PDR") public class EventBusTest extends AbstractTest { public class AnObserver<T> implements Observer<T> @@ -42,7 +42,7 @@ * Tests adding an observer to the event bus and verified that it can still * be retrieved for a corresponding event. */ - @Test(groups = "eventbus") + @Test(groups = "observerMethod") public void testAddObserver() { EventBus eventBus = new EventBus(); @@ -67,7 +67,7 @@ * Tests the remove operation and verifies that the observer is no longer * registered for events. */ - @Test(groups = "eventbus") + @Test(groups = "observerMethod") public void testRemoveObserver() { EventBus eventBus = new EventBus(); @@ -80,7 +80,7 @@ /** * Tests the deferred event feature associated with transactions. */ - @Test(groups = "eventbus") + @Test(groups = "deferredEvent") public void testDeferEvent() { // Setup a transaction manager for this test and inject into the event bus Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventObserverTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventObserverTest.java 2008-10-28 00:41:01 UTC (rev 187) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventObserverTest.java 2008-10-28 00:54:40 UTC (rev 188) @@ -3,10 +3,10 @@ import javax.webbeans.Observer; import org.jboss.webbeans.event.EventObserver; +import org.jboss.webbeans.test.beans.DangerCall; import org.jboss.webbeans.test.bindings.AnimalStereotypeAnnotationLiteral; import org.jboss.webbeans.test.bindings.RoleBinding; import org.jboss.webbeans.test.bindings.TameAnnotationLiteral; -import org.jboss.webbeans.test.beans.DangerCall; import org.testng.annotations.Test; /** @@ -17,7 +17,7 @@ * @author David Allen * */ -@SpecVersion("20081024-PDR") +@SpecVersion("PDR") public class EventObserverTest { public class AnObserver<T> implements Observer<T> @@ -32,7 +32,7 @@ * Tests different annotation literals as event bindings to make sure the wrapper * properly detects when an observer matches the given event bindings. */ - @Test(groups = "eventbus") + @Test(groups = "event") @SpecAssertion(section = "7.7.1") public void testIsObserverInterested() { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java 2008-10-28 00:41:01 UTC (rev 187) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java 2008-10-28 00:54:40 UTC (rev 188) @@ -13,11 +13,11 @@ import org.jboss.webbeans.test.annotations.AnotherDeploymentType; import org.jboss.webbeans.test.annotations.Synchronous; import org.jboss.webbeans.test.annotations.Tame; +import org.jboss.webbeans.test.beans.DangerCall; import org.jboss.webbeans.test.bindings.FishStereotypeAnnotationLiteral; import org.jboss.webbeans.test.bindings.RiverFishStereotypeAnnotationLiteral; import org.jboss.webbeans.test.bindings.SynchronousAnnotationLiteral; import org.jboss.webbeans.test.bindings.TameAnnotationLiteral; -import org.jboss.webbeans.test.beans.DangerCall; import org.jboss.webbeans.test.mock.MockManagerImpl; import org.jboss.webbeans.util.Reflections; import org.testng.annotations.BeforeMethod; @@ -29,7 +29,7 @@ * @author David Allen * */ -@SpecVersion("20081024-PDR") +@SpecVersion("PDR") public class EventTest { private MockManagerImpl manager = null; @@ -62,7 +62,7 @@ * instantiated implementation. */ @SuppressWarnings("unchecked") - @Test(groups = "eventbus") + @Test(groups = "event") @SpecAssertion(section = "7.6") public void testFireEvent() { @@ -106,7 +106,7 @@ * Tests the {@link Event#observe(javax.webbeans.Observer, Annotation...)} * method with a locally instantiated implementation. */ - @Test(groups = "eventbus") + @Test(groups = "event") @SpecAssertion(section = "7.6") public void testObserve() { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java 2008-10-28 00:41:01 UTC (rev 187) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java 2008-10-28 00:54:40 UTC (rev 188) @@ -74,7 +74,7 @@ * {@link org.jboss.webbeans.event.ObserverImpl#notify(javax.webbeans.Container, java.lang.Object)} * . */ - @Test(groups = "eventbus") @SpecAssertion(section={"7.5.7"}) + @Test(groups = "observerMethod") @SpecAssertion(section={"7.5.7"}) public final void testNotify() throws Exception { AnObserver observerInstance = new AnObserver(); Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-10-28 00:41:01 UTC (rev 187) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-10-28 00:54:40 UTC (rev 188) @@ -100,7 +100,7 @@ assert false; } - @Test(groups="eventbus") @SpecAssertion(section="3.2.4") + @Test(groups="observerMethod") @SpecAssertion(section="3.2.4") public void testBeanDeclaredInXmlIgnoresObserverMethodDeclaredInJava() { assert false; @@ -199,7 +199,7 @@ new SimpleBeanModel<Chicken>(new SimpleAnnotatedType<Chicken>(Chicken.class), getEmptyAnnotatedType(Chicken.class), manager); } - @Test(expectedExceptions=DefinitionException.class, groups="eventbus") @SpecAssertion(section="3.2.5.1") + @Test(expectedExceptions=DefinitionException.class, groups="observerMethod") @SpecAssertion(section="3.2.5.1") public void testConstructorHasObservesParameter() { new SimpleBeanModel<Chicken>(new SimpleAnnotatedType<Chicken>(Chicken.class), getEmptyAnnotatedType(Chicken.class), manager); Modified: ri/trunk/webbeans-ri/testng.xml =================================================================== --- ri/trunk/webbeans-ri/testng.xml 2008-10-28 00:41:01 UTC (rev 187) +++ ri/trunk/webbeans-ri/testng.xml 2008-10-28 00:54:40 UTC (rev 188) @@ -10,7 +10,8 @@ <exclude name="deployment" /> <exclude name="disposalMethod" /> <exclude name="producerMethod" /> - <exclude name="eventbus" /> + <exclude name="observerMethod" /> + <exclude name="deferredEvent" /> <exclude name="injection" /> <exclude name="ejb3" /> <exclude name="annotationDefinition" />