[webbeans-commits] Webbeans SVN: r3006 - in tck/trunk: impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle and 12 other directories.

Author: dallen6 Date: 2009-07-04 11:30:46 -0400 (Sat, 04 Jul 2009) New Revision: 3006 Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OwlFinch_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/register/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/registerUsingEvent/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DogWhisperer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java tck/trunk/pom.xml Log: Updated tests related to BeanManager changes for events Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/DeploymentTest.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -47,7 +47,7 @@ assert ManagerObserver.isManagerDeployed(); getCurrentManager().fireEvent("event"); // QUESTION what is this testing? - assert !getCurrentManager().resolveObservers(new InitializedBinding()).isEmpty(); + assert !getCurrentManager().resolveObserverMethods(new InitializedBinding()).isEmpty(); } @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BananaSpider.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -1,8 +1,5 @@ package org.jboss.jsr299.tck.tests.event; -import java.util.Set; - -import javax.enterprise.event.Observer; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.BeanManager; @@ -14,9 +11,7 @@ public void observeStringEvent(@Observes String event, BeanManager beanManager, @Spun Web web) { assert event != null; - Set<Observer<String>> allStringObservers = beanManager.resolveObservers(event); - assert allStringObservers != null; - assert allStringObservers.size() > 0; + assert !beanManager.resolveObserverMethods(event).isEmpty(); if ("validate injected parameters".equals(event)) { assert beanManager != null; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DogWhisperer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DogWhisperer.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/DogWhisperer.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -9,6 +9,6 @@ public void issueTamingCommand() { - event.fire(new MultiBindingEvent(), new TameAnnotationLiteral(), new RoleBinding("Admin")); + event.select(new TameAnnotationLiteral(), new RoleBinding("Admin")).fire(new MultiBindingEvent()); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -7,6 +7,7 @@ import javax.enterprise.event.Observer; import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.ObserverMethod; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -28,7 +29,7 @@ public class EventTest extends AbstractJSR299Test { private static final String FIRE_EVENT_METHOD_NAME = "fireEvent"; - private static final String RESOLVE_OBSERVERS_METHOD_NAME = "resolveObservers"; + private static final String RESOLVE_OBSERVERS_METHOD_NAME = "resolveObserverMethods"; public static class AnEventType { @@ -38,51 +39,6 @@ { } - public static class AnObserver implements Observer<AnEventType> - { - public boolean wasNotified = false; - - public boolean notify(AnEventType event) - { - wasNotified = true; - return false; - } - } - - public static class AListObserver implements Observer<ArrayList<String>> - { - public boolean wasNotified = false; - - public boolean notify(ArrayList<String> event) - { - wasNotified = true; - return false; - } - } - - public static class AnotherListObserver implements Observer<ArrayList<Integer>> - { - public boolean wasNotified = false; - - public boolean notify(ArrayList<Integer> event) - { - wasNotified = true; - return false; - } - } - - public static class AnObserverWithException implements Observer<AnEventType> - { - public boolean wasNotified = false; - public RuntimeException theException = new RuntimeException("RE1"); - - public boolean notify(AnEventType event) - { - wasNotified = true; - throw theException; - } - } - /** * An event binding type is a Java annotation defined as @Target({FIELD, * PARAMETER}) ~or @Target({METHOD, FIELD, PARAMETER, TYPE}) and @@ -186,20 +142,6 @@ } @Test(groups = { "events" }) - @SpecAssertion(section = "10.3", id = "a") - public void testObserversImplementObserverInterface() - { - Observer<String> observer = new Observer<String>() - { - public boolean notify(String event) - { - return false; - } - }; - getCurrentManager().addObserver(observer); - } - - @Test(groups = { "events" }) @SpecAssertions({ @SpecAssertion(section = "11.2.9", id = "a"), @SpecAssertion(section = "11.2.9", id = "b") @@ -217,16 +159,16 @@ }) public void testObserverMethodAutomaticallyRegistered() { - assert !getCurrentManager().resolveObservers(new String()).isEmpty(); + assert !getCurrentManager().resolveObserverMethods(new String()).isEmpty(); } @Test(groups = { "events", "ri-broken" }) @SpecAssertion(section = "12.3", id = "o") public void testObserverMethodNotAutomaticallyRegisteredForDisabledBeans() { - Set<Observer<String>> observers = getCurrentManager().resolveObservers(new String()); + Set<ObserverMethod<?, String>> observers = getCurrentManager().resolveObserverMethods(new String()); assert observers.size() == 2; - for (Observer<String> observer : observers) + for (ObserverMethod<?, String> observer : observers) { // an assertion error will be raised if an inappropriate observer is called observer.notify("fail if disable observer invoked"); @@ -237,7 +179,7 @@ @SpecAssertion(section = "10.5", id = "e") public void testMultipleObserverMethodsForSameEventPermissible() { - assert getCurrentManager().resolveObservers(new String()).size() > 1; + assert getCurrentManager().resolveObserverMethods(new String()).size() > 1; } @Test(groups = { "events" }) @@ -245,19 +187,16 @@ public void testMultipleObserverMethodsOnBeanPermissible() { // Resolve the observers for types 1 and 2 - Set<Observer<ObservedType1>> resolvedStringObservers = getCurrentManager().resolveObservers(new ObservedType1()); - assert resolvedStringObservers.size() == 1; + assert getCurrentManager().resolveObserverMethods(new ObservedType1()).size() == 1; - Set<Observer<ObservedType2>> resolvedIntegerObservers = getCurrentManager().resolveObservers(new ObservedType2()); - assert resolvedIntegerObservers.size() == 1; + assert getCurrentManager().resolveObserverMethods(new ObservedType2()).size() == 1; } @Test(groups = { "events", "ejb" }) @SpecAssertion(section = "10.5", id = "d") public void testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic() { - Set<Observer<EJBEvent>> observers = getCurrentManager().resolveObservers(new EJBEvent()); - assert observers.size() == 2; + assert getCurrentManager().resolveObserverMethods(new EJBEvent()).size() == 2; } @Test(groups = { "events" }) @@ -265,8 +204,7 @@ public void testObserverMethodWithoutBindingTypesObservesEventsWithoutBindingTypes() { // Resolve registered observers with an event containing no binding types - Set<Observer<SimpleEventType>> resolvedObservers = getCurrentManager().resolveObservers(new SimpleEventType()); - assert resolvedObservers.size() == 2; + assert getCurrentManager().resolveObserverMethods(new SimpleEventType()).size() == 2; } @Test(groups = { "events" }) @@ -278,8 +216,7 @@ public void testObserverMethodMayHaveMultipleBindingTypes() { // If we can resolve the observer with the two binding types, then it worked - Set<Observer<MultiBindingEvent>> resolvedObservers = getCurrentManager().resolveObservers(new MultiBindingEvent(), new RoleBinding("Admin"), new TameAnnotationLiteral()); - assert resolvedObservers.size() == 2; + assert getCurrentManager().resolveObserverMethods(new MultiBindingEvent(), new RoleBinding("Admin"), new TameAnnotationLiteral()).size() == 2; } @Test(groups = { "events" }) @@ -328,8 +265,7 @@ public void testObserverMethodRegistration() { // Resolve registered observers with an event containing no binding types - Set<Observer<SimpleEventType>> resolvedObservers = getCurrentManager().resolveObservers(new SimpleEventType()); - assert resolvedObservers.size() == 2; + assert getCurrentManager().resolveObserverMethods(new SimpleEventType()).size() == 2; } @Test(groups = { "events" }) @@ -442,23 +378,6 @@ }.run(); } - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertion(section = "11.2.7", id = "d") - public void testDuplicateBindingsToObservesFails() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - SweeWaxbill bean = getInstanceByType(SweeWaxbill.class); - bean.methodThatRegistersObserver(); - } - - }.run(); - } - // FIXME the assertion is being verified indirectly by verifying outcome // to verify directly, would need to mock BeanManager (very hard) or // intercept the call to BeanManager#fireEvent() (equally hard) @@ -496,7 +415,7 @@ private <E> void eventObjectContainsTypeVariables(ArrayList<E> eventToFire) { - getCurrentManager().resolveObservers(eventToFire); + getCurrentManager().resolveObserverMethods(eventToFire); } @Test(groups = { "events", "ri-broken" }) @@ -509,7 +428,7 @@ private void eventObjectContainsWildcards(ArrayList<?> eventToFire) { // FIXME create a valid observer and assert it is found - getCurrentManager().resolveObservers(eventToFire); + getCurrentManager().resolveObserverMethods(eventToFire); } @@ -598,7 +517,7 @@ protected void execute() throws Exception { Egg egg = new Egg(); - Set<Observer<Egg>> observers = getCurrentManager().resolveObservers(egg); + Set<ObserverMethod<?, Egg>> observers = getCurrentManager().resolveObserverMethods(egg); assert observers.size() == 1; // Notify the observer so we can confirm that it @@ -621,7 +540,7 @@ protected void execute() throws Exception { StockPrice price = new StockPrice(); - Set<Observer<StockPrice>> observers = getCurrentManager().resolveObservers(price); + Set<ObserverMethod<?, StockPrice>> observers = getCurrentManager().resolveObserverMethods(price); assert observers.size() == 1; // Notify the observer so we can confirm that it Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OwlFinch_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OwlFinch_Broken.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/OwlFinch_Broken.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -1,28 +0,0 @@ -package org.jboss.jsr299.tck.tests.event; - -import javax.enterprise.event.Event; -import javax.enterprise.event.Observer; -import javax.enterprise.inject.Any; - - -class OwlFinch_Broken -{ - @Any - private Event<String> simpleEvent; - - public void methodThatFiresEvent() - { - simpleEvent.fire("An event", new AnimalStereotypeAnnotationLiteral()); - } - - public void methodThatRegistersObserver() - { - simpleEvent.observe(new Observer<String>() - { - public boolean notify(String event) - { - return false; - } - }, new AnimalStereotypeAnnotationLiteral()); - } -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/SweeWaxbill.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -1,7 +1,6 @@ package org.jboss.jsr299.tck.tests.event; import javax.enterprise.event.Event; -import javax.enterprise.event.Observer; import javax.enterprise.inject.Any; class SweeWaxbill @@ -11,18 +10,6 @@ public void methodThatFiresEvent() { - simpleEvent.fire("string event", new RoleBinding("Admin")); + simpleEvent.select(new RoleBinding("Admin")).fire("string event"); } - - public void methodThatRegistersObserver() - { - simpleEvent.observe(new Observer<String>() - { - - public boolean notify(String event) - { - return false; - } - }, new RoleBinding("Admin")); - } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -36,6 +36,6 @@ @SpecAssertion(section = "10.5", id = "b") public void testObserverMethodNotOnSimpleOrSessionBeanFails() { - assert getCurrentManager().resolveObservers("event").isEmpty(); + assert getCurrentManager().resolveObserverMethods("event").isEmpty(); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -1,7 +1,6 @@ package org.jboss.jsr299.tck.tests.event.fires.nonbinding; import javax.enterprise.event.Event; -import javax.enterprise.event.Observer; import javax.enterprise.inject.Any; @@ -12,17 +11,6 @@ public void methodThatFiresEvent() { - simpleEvent.fire("An event", new AnimalStereotypeAnnotationLiteral()); + simpleEvent.select(new AnimalStereotypeAnnotationLiteral()).fire("An event"); } - - public void methodThatRegistersObserver() - { - simpleEvent.observe(new Observer<String>() - { - public boolean notify(String event) - { - return false; - } - }, new AnimalStereotypeAnnotationLiteral()); - } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -2,7 +2,7 @@ import java.lang.annotation.Annotation; -import javax.enterprise.event.Observer; +import javax.enterprise.event.Observes; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -20,18 +20,27 @@ { } - public static class AnObserver implements Observer<AnEventType> + public static class AnObserver { - public boolean wasNotified = false; + public static boolean wasNotified = false; - public boolean notify(AnEventType event) + public void observer(@Observes AnEventType event) { wasNotified = true; - return false; } } - @Test(groups = { "events" }) + public static class AnotherObserver + { + public static boolean wasNotified = false; + + public void observer(@Observes @Role("Admin") AnEventType event) + { + wasNotified = true; + } + } + + @Test(groups = { "events", "ri-broken" }) @SpecAssertions( { @SpecAssertion(section = "10.2", id = "h"), @SpecAssertion(section = "11.2.7", id = "b"), @@ -40,31 +49,27 @@ public void testObserverNotifiedWhenEventTypeAndAllBindingsMatch() { Annotation roleBinding = new RoleBinding("Admin"); - AnObserver observer1 = new AnObserver(); - AnObserver observer2 = new AnObserver(); - getCurrentManager().addObserver(observer1); - getCurrentManager().addObserver(observer2, roleBinding); // Fire an event that will be delivered to the two above observers AnEventType anEvent = new AnEventType(); getCurrentManager().fireEvent(anEvent, roleBinding); - assert observer1.wasNotified; - assert observer2.wasNotified; - observer1.wasNotified = false; - observer2.wasNotified = false; + assert AnObserver.wasNotified; + assert AnotherObserver.wasNotified; + AnObserver.wasNotified = false; + AnotherObserver.wasNotified = false; // Fire an event that will be delivered to only one getCurrentManager().fireEvent(anEvent); - assert observer1.wasNotified; - assert !observer2.wasNotified; - observer1.wasNotified = false; - observer2.wasNotified = false; + assert AnObserver.wasNotified; + assert !AnotherObserver.wasNotified; + AnObserver.wasNotified = false; + AnotherObserver.wasNotified = false; // Also make sure the binding value is considered getCurrentManager().fireEvent(anEvent, new RoleBinding("user")); - assert observer1.wasNotified; - assert !observer2.wasNotified; + assert AnObserver.wasNotified; + assert !AnotherObserver.wasNotified; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/abortProcessing/ObserverExceptionAbortsProcessingTest.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event.observer.abortProcessing; -import javax.enterprise.event.Observer; +import javax.enterprise.event.Observes; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -17,27 +17,34 @@ { } - public static class AnObserverWithException implements Observer<AnEventType> + public static class AnObserverWithException { - public boolean wasNotified = false; - public RuntimeException theException = new RuntimeException("RE1"); + public static boolean wasNotified = false; + public static final RuntimeException theException = new RuntimeException("RE1"); - public boolean notify(AnEventType event) + public void observer(@Observes AnEventType event) { wasNotified = true; throw theException; } } + public static class AnotherObserverWithException + { + public static boolean wasNotified = false; + public static final RuntimeException theException = new RuntimeException("RE2"); + + public void observer(@Observes AnEventType event) + { + wasNotified = true; + throw theException; + } + } + @Test(groups = { "events" }) @SpecAssertion(section = "10.6", id = "c") public void testObserverThrowsExceptionAbortsNotifications() { - AnObserverWithException observer = new AnObserverWithException(); - AnObserverWithException anotherObserver = new AnObserverWithException(); - getCurrentManager().addObserver(anotherObserver); - getCurrentManager().addObserver(observer); - // Fire an event that will be delivered to the two above observers AnEventType anEvent = new AnEventType(); boolean fireFailed = false; @@ -47,17 +54,17 @@ } catch (Exception e) { - if (e.equals(observer.theException)) + if (e.equals(AnObserverWithException.theException)) { fireFailed = true; - assert observer.wasNotified; - assert !anotherObserver.wasNotified; + assert AnObserverWithException.wasNotified; + assert !AnotherObserverWithException.wasNotified; } - else if (e.equals(anotherObserver.theException)) + else if (e.equals(AnotherObserverWithException.theException)) { fireFailed = true; - assert !observer.wasNotified; - assert anotherObserver.wasNotified; + assert !AnObserverWithException.wasNotified; + assert AnotherObserverWithException.wasNotified; } } assert fireFailed; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -3,6 +3,7 @@ import java.util.Set; import javax.enterprise.event.Observer; +import javax.enterprise.inject.spi.ObserverMethod; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -34,7 +35,7 @@ protected void execute() throws Exception { Egg egg = new Egg(); - Set<Observer<Egg>> observers = getCurrentManager().resolveObservers(egg); + Set<ObserverMethod<?, Egg>> observers = getCurrentManager().resolveObserverMethods(egg); assert observers.size() == 1; // Notify the observer so we can confirm that it @@ -57,7 +58,7 @@ protected void execute() throws Exception { StockPrice stockPrice = new StockPrice(); - Set<Observer<StockPrice>> observers = getCurrentManager().resolveObservers(stockPrice); + Set<ObserverMethod<?, StockPrice>> observers = getCurrentManager().resolveObserverMethods(stockPrice); assert observers.size() == 1; // Notify the observer so we can confirm that it Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/DuplicateBindingTypesWhenResolvingTest.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -1,6 +1,6 @@ package org.jboss.jsr299.tck.tests.event.resolve.binding; -import javax.enterprise.event.Observer; +import javax.enterprise.event.Observes; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -17,14 +17,13 @@ { } - public static class AnObserver implements Observer<AnEventType> + public static class AnObserver { public boolean wasNotified = false; - public boolean notify(AnEventType event) + public void observer(@Observes AnEventType event) { wasNotified = true; - return false; } } @@ -32,8 +31,6 @@ @SpecAssertion(section = "11.2.9", id = "d") public void testDuplicateBindingTypesWhenResolvingFails() { - AnObserver observer = new AnObserver(); - getCurrentManager().addObserver(observer, new BindingTypeABinding()); - getCurrentManager().resolveObservers(new AnEventType(), new BindingTypeABinding(), new BindingTypeABinding()); + getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeABinding(), new BindingTypeABinding()); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -3,6 +3,7 @@ import java.util.Set; import javax.enterprise.event.Observer; +import javax.enterprise.event.Observes; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -20,17 +21,26 @@ { } - public static class AnObserver implements Observer<AnEventType> + public static class AnObserver { public boolean wasNotified = false; - public boolean notify(AnEventType event) + public void observer(@Observes @BindingTypeC("first-observer") AnEventType event) { wasNotified = true; - return false; } } + public static class AnotherObserver + { + public boolean wasNotified = false; + + public void observer(@Observes @BindingTypeC("second-observer") AnEventType event) + { + wasNotified = true; + } + } + @Test(groups = { "events" }) @SpecAssertions({ @SpecAssertion(section = "10.5.1", id = "a"), @@ -39,13 +49,7 @@ }) public void testResolvingChecksBindingTypeMembers() { - AnObserver observer = new AnObserver(); - AnObserver anotherObserver = new AnObserver(); - getCurrentManager().addObserver(observer, new BindingTypeCBinding("first-observer")); - getCurrentManager().addObserver(anotherObserver, new BindingTypeCBinding("second-observer")); - Set<Observer<AnEventType>> resolvedObservers = getCurrentManager().resolveObservers(new AnEventType(), new BindingTypeCBinding("first-observer")); - assert resolvedObservers.size() == 1; - resolvedObservers = getCurrentManager().resolveObservers(new AnEventType(), new BindingTypeCBinding("second-observer")); - assert resolvedObservers.size() == 1; + assert getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeCBinding("first-observer")).size() == 1; + assert getCurrentManager().resolveObserverMethods(new AnEventType(), new BindingTypeCBinding("second-observer")).size() == 1; } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -2,7 +2,8 @@ import java.util.Set; -import javax.enterprise.event.Observer; +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.ObserverMethod; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -19,14 +20,13 @@ { } - public static class AnObserver implements Observer<AnEventType> + public static class AnObserver { public boolean wasNotified = false; - public boolean notify(AnEventType event) + public void observer(@Observes AnEventType event) { wasNotified = true; - return false; } } @@ -34,8 +34,6 @@ @SpecAssertion(section = "11.2.9", id = "e") public void testNonBindingTypeAnnotationWhenResolvingFails() { - AnObserver observer = new AnObserver(); - getCurrentManager().addObserver(observer); - Set<Observer<AnEventType>> resolvedObservers = getCurrentManager().resolveObservers(new AnEventType(), new AnimalStereotypeAnnotationLiteral()); + Set<ObserverMethod<?, AnEventType>> resolvedObservers = getCurrentManager().resolveObserverMethods(new AnEventType(), new AnimalStereotypeAnnotationLiteral()); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/CheckTypeParametersWhenResolvingObserversTest.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -3,6 +3,7 @@ import java.util.ArrayList; import javax.enterprise.event.Observer; +import javax.enterprise.event.Observes; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; @@ -31,25 +32,23 @@ private static final long serialVersionUID = 1L; } - public static class StringListObserver implements Observer<ArrayList<String>> + public static class StringListObserver { public boolean wasNotified = false; - public boolean notify(ArrayList<String> event) + public void observer(@Observes ArrayList<String> event) { wasNotified = true; - return false; } } - public static class IntegerListObserver implements Observer<ArrayList<Integer>> + public static class IntegerListObserver { public boolean wasNotified = false; - public boolean notify(ArrayList<Integer> event) + public void observer(@Observes ArrayList<Integer> event) { wasNotified = true; - return false; } } @@ -60,13 +59,8 @@ }) public void testResolvingChecksTypeParameters() { - StringListObserver observer = new StringListObserver(); - IntegerListObserver anotherObserver = new IntegerListObserver(); - getCurrentManager().addObserver(observer); - getCurrentManager().addObserver(anotherObserver); - assert getCurrentManager().resolveObservers(new StringList()).size() == 1; - assert getCurrentManager().resolveObservers(new StringList()).iterator().next().getClass().equals(StringListObserver.class); - assert getCurrentManager().resolveObservers(new CharacterList()).size() == 0; + assert getCurrentManager().resolveObserverMethods(new StringList()).size() == 1; + assert getCurrentManager().resolveObserverMethods(new CharacterList()).size() == 0; } @Test(groups = { "events" }) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/typeWithParameters/ChecksEventTypeWhenResolvingTest.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -3,6 +3,7 @@ import java.util.Set; import javax.enterprise.event.Observer; +import javax.enterprise.event.Observes; import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; @@ -19,14 +20,13 @@ { } - public static class AnObserver implements Observer<AnEventType> + public static class AnObserver { public boolean wasNotified = false; - public boolean notify(AnEventType event) + public void observes(@Observes AnEventType event) { wasNotified = true; - return false; } } @@ -34,11 +34,7 @@ @SpecAssertion(section = "10.5.1", id = "a") public void testResolvingChecksEventType() { - Observer<AnEventType> observer = new AnObserver(); - getCurrentManager().addObserver(observer); - Set<Observer<AnEventType>> resolvedObservers = getCurrentManager().resolveObservers(new AnEventType()); - assert !resolvedObservers.isEmpty(); - Set<?> emptyObserverSet = getCurrentManager().resolveObservers(new UnusedEventType("name")); - assert emptyObserverSet.isEmpty(); + assert !getCurrentManager().resolveObserverMethods(new AnEventType()).isEmpty(); + assert getCurrentManager().resolveObserverMethods(new UnusedEventType("name")).isEmpty(); } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -91,7 +91,7 @@ { dog.setCorrectContext(false); dog.setCorrectTransactionState(false); - assert !getCurrentManager().resolveObservers("event").isEmpty(); + assert !getCurrentManager().resolveObserverMethods("event").isEmpty(); Agent dogAgent = getInstanceByType(Agent.class); dogAgent.sendInTransaction("event"); Thread.sleep(100); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -92,7 +92,7 @@ public void testNewBeanHasNoObservers() { // Should just be 1 observer from bean, not new bean - assert getCurrentManager().resolveObservers("event").size() == 1; + assert getCurrentManager().resolveObserverMethods("event").size() == 1; } @Test Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-07-04 15:30:46 UTC (rev 3006) @@ -95,7 +95,7 @@ public void testNewBeanHasNoObservers() { // As long as only one observer exists here, we know it is not from the @New bean - assert getCurrentManager().resolveObservers("event").size() == 1; + assert getCurrentManager().resolveObserverMethods("event").size() == 1; } @Test(groups = { "new" }) Modified: tck/trunk/pom.xml =================================================================== --- tck/trunk/pom.xml 2009-07-04 15:28:43 UTC (rev 3005) +++ tck/trunk/pom.xml 2009-07-04 15:30:46 UTC (rev 3006) @@ -119,7 +119,7 @@ <dependency> <groupId>org.jboss.webbeans</groupId> <artifactId>jsr299-api</artifactId> - <version>1.0.0.PREVIEW2</version> + <version>1.0.0-SNAPSHOT</version> </dependency> <dependency> <groupId>org.jboss.jsr299.tck</groupId>