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

Author: dallen6 Date: 2009-01-19 08:38:28 -0500 (Mon, 19 Jan 2009) New Revision: 1079 Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/FiresBinding.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BananaSpider.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BlueFacedParrotFinch.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EventBusTest.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/OrangeCheekedWaxbill.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/PomeranianInterface.java tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Terrier.java Log: Repaired most of the broken event tests except for 1. Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-01-19 13:14:04 UTC (rev 1078) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-01-19 13:38:28 UTC (rev 1079) @@ -57,6 +57,7 @@ import org.jboss.webbeans.ejb.spi.EjbResolver; import org.jboss.webbeans.event.EventManager; import org.jboss.webbeans.injection.InjectionPointProvider; +import org.jboss.webbeans.introspector.AnnotatedClass; import org.jboss.webbeans.introspector.AnnotatedItem; import org.jboss.webbeans.introspector.AnnotatedMethod; import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl; @@ -202,8 +203,28 @@ * @see javax.webbeans.manager.Manager#resolveObservers(java.lang.Object, * java.lang.annotation.Annotation[]) */ + @SuppressWarnings("unchecked") public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings) { + AnnotatedClass<T> element = AnnotatedClassImpl.of((Class<T>)event.getClass()); + for (Annotation annotation : bindings) + { + if (!MetaDataCache.instance().getBindingTypeModel(annotation.annotationType()).isValid()) + { + throw new IllegalArgumentException("Not a binding type " + annotation); + } + } + for (Type type : element.getActualTypeArguments()) + { + if (type instanceof WildcardType) + { + throw new IllegalArgumentException("Cannot resolve an event type parameterized with a wildcard " + element); + } + if (type instanceof TypeVariable) + { + throw new IllegalArgumentException("Cannot resolve an event type parameterized with a type parameter " + element); + } + } return eventManager.getObservers(event, bindings); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-01-19 13:14:04 UTC (rev 1078) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-01-19 13:38:28 UTC (rev 1079) @@ -163,7 +163,6 @@ { if (observer.isObserverInterested(bindings)) { - // TODO Fix this! @SuppressWarnings("unchecked") Observer<T> o = (Observer<T>) observer.getObserver(); interestedObservers.add(o); Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BananaSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BananaSpider.java 2009-01-19 13:14:04 UTC (rev 1078) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BananaSpider.java 2009-01-19 13:38:28 UTC (rev 1079) @@ -2,6 +2,7 @@ import java.util.Set; +import javax.webbeans.Current; import javax.webbeans.Observer; import javax.webbeans.Observes; import javax.webbeans.manager.Manager; @@ -12,7 +13,7 @@ */ class BananaSpider { - public void observeStringEvent(@Observes String someEvent, Manager manager) + public void observeStringEvent(@Observes String someEvent, @Current Manager manager) { assert someEvent != null; assert manager != null; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BlueFacedParrotFinch.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BlueFacedParrotFinch.java 2009-01-19 13:14:04 UTC (rev 1078) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/BlueFacedParrotFinch.java 2009-01-19 13:38:28 UTC (rev 1079) @@ -23,4 +23,9 @@ } }); } + + public Event<String> getSimpleEvent() + { + return simpleEvent; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EventBusTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EventBusTest.java 2009-01-19 13:14:04 UTC (rev 1078) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/EventBusTest.java 2009-01-19 13:38:28 UTC (rev 1079) @@ -1,12 +1,16 @@ package org.jboss.webbeans.tck.tests.event; import java.lang.annotation.Annotation; +import java.util.ArrayList; import java.util.Set; import javax.webbeans.DefinitionException; +import javax.webbeans.Dependent; import javax.webbeans.DuplicateBindingTypeException; +import javax.webbeans.Event; import javax.webbeans.Observer; import javax.webbeans.ObserverException; +import javax.webbeans.Standard; import javax.webbeans.TypeLiteral; import javax.webbeans.manager.Bean; @@ -43,6 +47,16 @@ } } + public static class AListObserver implements Observer<ArrayList<String>> + { + public boolean wasNotified = false; + + public void notify(ArrayList<String> event) + { + wasNotified = true; + } + } + public static class AnObserverWithException implements Observer<AnEventType> { public boolean wasNotified = false; @@ -291,29 +305,29 @@ assert false; } - @Test(groups = { "broken", "events" }) + @Test(groups = { "events" }) @SpecAssertion(section = "8.5") public void testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic() { deployBeans(Pomeranian.class); Set<Bean<Object>> beans = manager.resolveByType(Object.class); - assert beans.size() == 2 + BUILT_IN_BEANS; + assert beans.size() >= 2; Set<Observer<String>> observers = manager.resolveObservers("An event"); assert observers.size() == 2; } - @Test(groups = { "broken", "events" }) + @Test(groups = { "events" }) @SpecAssertion(section = "8.5") public void testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFails() { deployBeans(TibetanTerrier.class); Set<Bean<Object>> beans = manager.resolveByType(Object.class); - assert beans.size() == 2 + BUILT_IN_BEANS; + assert beans.size() >= 2; Set<Observer<String>> observers = manager.resolveObservers("An event"); assert observers.size() == 1; } - @Test(groups = { "broken", "events" }) + @Test(groups = { "events" }) @SpecAssertion(section = "8.5") public void testMultipleObserverMethodsOK() { @@ -328,7 +342,7 @@ public void testObserverMethodMustHaveOnlyOneEventParameter() { deployBeans(YorkshireTerrier.class); - + Set<Bean<Object>> beans = manager.resolveByType(Object.class); assert beans != null; } @@ -342,14 +356,14 @@ assert beans != null; } - @Test(groups = { "broken", "events" }) + @Test(groups = { "events" }) @SpecAssertion(section = "8.5.1") public void testObserverMethodWithoutBindingTypesObservesEventsWithoutBindingTypes() { // This observer has no binding types specified deployBeans(Pomeranian.class); Set<Bean<Object>> beans = manager.resolveByType(Object.class); - assert beans.size() == 2 + BUILT_IN_BEANS; + assert beans.size() >= 2; // Resolve registered observers with an event containing no binding types Set<Observer<String>> resolvedObservers = manager.resolveObservers("A new event"); @@ -421,7 +435,7 @@ { assert false; } - + @Test(groups = { "events" }) @SpecAssertion(section = "8.5.4") public void testObserverMethodReceivesInjectionsOnNonObservesParameters() @@ -444,14 +458,14 @@ manager.fireEvent("New string event"); // Should not be notified since bean is not instantiated yet assert !RecluseSpider.isNotified(); - + // Now instantiate the bean and fire another event try { activateDependentContext(); RecluseSpider bean = manager.getInstanceByType(RecluseSpider.class); assert bean != null; - + manager.fireEvent("Another event"); assert RecluseSpider.isNotified(); } @@ -508,7 +522,7 @@ public void testObserverMethodRegistration() { // For now, this test is checking the registration of methods - //TODO Check the called test to make sure it is still valid here + // TODO Check the called test to make sure it is still valid here testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic(); } @@ -521,11 +535,11 @@ { deployBeans(Pomeranian.class); Set<Bean<Object>> beans = manager.resolveByType(Object.class); - assert beans.size() == 1; + assert beans.size() >= 1; String event = "A new event"; Set<Observer<String>> observers = manager.resolveObservers(event); - assert observers.size() == 1; - + assert observers.size() == 2; + manager.fireEvent(event); assert Thread.currentThread().equals(Pomeranian.notificationThread); } @@ -537,7 +551,7 @@ assert false; } - @Test(groups = { "events" }, expectedExceptions={ TeaCupPomeranian.OversizedException.class }) + @Test(groups = { "events" }, expectedExceptions = { TeaCupPomeranian.OversizedException.class }) @SpecAssertion(section = "8.5.7") public void testNonTransactionalObserverThrownNonCheckedExceptionIsRethrown() { @@ -547,7 +561,7 @@ manager.fireEvent("Another event"); } - @Test(groups = { "events" }, expectedExceptions={ ObserverException.class }) + @Test(groups = { "events" }, expectedExceptions = { ObserverException.class }) @SpecAssertion(section = "8.5.7") public void testNonTransactionalObserverThrownCheckedExceptionIsWrappedAndRethrown() { @@ -574,7 +588,7 @@ } } - @Test(groups = { "events" }, expectedExceptions={ DuplicateBindingTypeException.class }) + @Test(groups = { "events" }, expectedExceptions = { DuplicateBindingTypeException.class }) @SpecAssertion(section = "8.6") public void testDuplicateBindingsToObservesFails() { @@ -756,32 +770,92 @@ } } - @Test(groups = { "stub", "events" }) + @Test(groups = { "events" }) @SpecAssertion(section = "8.6") - public void testImplicitObserverBeanMatchesAPITypeOfInectionPoint() + public void testImplicitEventBeanMatchesAPITypeOfInectionPoint() { - assert false; + deployBeans(BlueFacedParrotFinch.class); + try + { + activateDependentContext(); + BlueFacedParrotFinch bean = manager.getInstanceByType(BlueFacedParrotFinch.class); + assert bean != null; + // Retrieve the implicit event bean from the manager only by its API + // type + Set<?> eventBeans = manager.resolveByType(Event.class, new FiresBinding()); + assert !eventBeans.isEmpty(); + } + finally + { + deactivateDependentContext(); + } } - @Test(groups = { "stub", "events" }) + @Test(groups = { "events" }) @SpecAssertion(section = "8.6") - public void testImplicitObserverBeanMatchesBindingAnnotationsOfInjectionPoint() + public void testImplicitEventBeanMatchesBindingAnnotationsOfInjectionPoint() { - assert false; + deployBeans(OrangeCheekedWaxbill.class); + try + { + activateDependentContext(); + OrangeCheekedWaxbill bean = manager.getInstanceByType(OrangeCheekedWaxbill.class); + assert bean != null; + // Retrieve the implicit event bean from the manager by its binding + // types + Set<?> eventBeans = manager.resolveByType(Event.class, new FiresBinding(), new TameAnnotationLiteral()); + assert !eventBeans.isEmpty(); + } + finally + { + deactivateDependentContext(); + } } - @Test(groups = { "stub", "events" }) + @Test(groups = { "events" }) @SpecAssertion(section = "8.6") - public void testImplicitObserverBeanHasStandardDeploymentType() + public void testImplicitEventBeanHasStandardDeploymentType() { - assert false; + deployBeans(BlueFacedParrotFinch.class); + try + { + activateDependentContext(); + BlueFacedParrotFinch bean = manager.getInstanceByType(BlueFacedParrotFinch.class); + assert bean != null; + // Retrieve the implicit event bean from the manager only by its API + // type + Set<?> eventBeans = manager.resolveByType(Event.class, new FiresBinding()); + assert eventBeans.size() == 1; + Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); + assert eventBean.getDeploymentType().equals(Standard.class); + } + finally + { + deactivateDependentContext(); + } } - @Test(groups = { "stub", "events" }) + @Test(groups = { "events" }) @SpecAssertion(section = "8.6") - public void testImplicitObserverBeanHasDependentScope() + public void testImplicitEventBeanHasDependentScope() { - assert false; + deployBeans(BlueFacedParrotFinch.class); + try + { + activateDependentContext(); + BlueFacedParrotFinch bean = manager.getInstanceByType(BlueFacedParrotFinch.class); + assert bean != null; + // Retrieve the implicit event bean from the manager only by its API + // type + Set<?> eventBeans = manager.resolveByType(Event.class, new FiresBinding()); + assert eventBeans.size() == 1; + Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); + assert eventBean.getScopeType().equals(Dependent.class); + } + finally + { + deactivateDependentContext(); + } } @Test(groups = { "stub", "events" }) @@ -847,25 +921,40 @@ assert false; } - @Test(groups = { "stub", "events" }) + @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) @SpecAssertion(section = "8.7") public void testNonBindingTypeAnnotationWhenResolvingFails() { - assert false; + AnObserver observer = new AnObserver(); + manager.addObserver(observer, new TypeLiteral<AnEventType>() + { + }); + Set<Observer<AnEventType>> resolvedObservers = manager.resolveObservers(new AnEventType(), new AnimalStereotypeAnnotationLiteral()); + assert !resolvedObservers.isEmpty(); } - @Test(groups = { "stub", "events" }) + @Test(groups = { "events" }) @SpecAssertion(section = "8.7") public void testResolvingChecksEventType() { - assert false; + Observer<AnEventType> observer = new AnObserver(); + manager.addObserver(observer, AnEventType.class); + Set<Observer<AnEventType>> resolvedObservers = manager.resolveObservers(new AnEventType()); + assert !resolvedObservers.isEmpty(); + Set<?> emptyObserverSet = manager.resolveObservers("A string event"); + assert emptyObserverSet.isEmpty(); } @Test(groups = { "stub", "events" }) @SpecAssertion(section = "8.7") public void testResolvingChecksTypeParameters() { - assert false; + AListObserver observer = new AListObserver(); + manager.addObserver(observer, new TypeLiteral<ArrayList<String>>() + { + }); + Set<Observer<ArrayList<String>>> resolvedObservers = manager.resolveObservers(new ArrayList<String>(), new AnimalStereotypeAnnotationLiteral()); + assert !resolvedObservers.isEmpty(); } @Test(groups = { "stub", "events" }) Added: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/FiresBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/FiresBinding.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/FiresBinding.java 2009-01-19 13:38:28 UTC (rev 1079) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.tck.tests.event; + +import javax.webbeans.AnnotationLiteral; +import javax.webbeans.Fires; + +public class FiresBinding extends AnnotationLiteral<Fires> implements Fires +{ + +} Property changes on: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/FiresBinding.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/OrangeCheekedWaxbill.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/OrangeCheekedWaxbill.java 2009-01-19 13:14:04 UTC (rev 1078) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/OrangeCheekedWaxbill.java 2009-01-19 13:38:28 UTC (rev 1079) @@ -10,19 +10,25 @@ { private Mess someMess; + private Event<Mess> injectedEvent; public OrangeCheekedWaxbill() { } @Initializer - public void theInitializerMethod(@Fires Event<Mess> eventObject) + public void theInitializerMethod(@Fires @Tame Event<Mess> eventObject) { // Create a new mess and fire the event for it someMess = new Mess(); eventObject.fire(someMess); } + public Event<Mess> getInjectedEvent() + { + return injectedEvent; + } + public Mess getSomeMess() { return someMess; Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/PomeranianInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/PomeranianInterface.java 2009-01-19 13:14:04 UTC (rev 1078) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/PomeranianInterface.java 2009-01-19 13:38:28 UTC (rev 1079) @@ -1,6 +1,6 @@ package org.jboss.webbeans.tck.tests.event; -interface PomeranianInterface +public interface PomeranianInterface { } Modified: tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Terrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Terrier.java 2009-01-19 13:14:04 UTC (rev 1078) +++ tck/trunk/impl/src/main/java/org/jboss/webbeans/tck/tests/event/Terrier.java 2009-01-19 13:38:28 UTC (rev 1079) @@ -3,7 +3,7 @@ import javax.ejb.Local; @Local -interface Terrier +public interface Terrier { }