[webbeans-commits] Webbeans SVN: r2907 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event: broken and 9 other directories.

Author: dan.j.allen Date: 2009-06-26 17:52:51 -0400 (Fri, 26 Jun 2009) New Revision: 2907 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventPayload.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonManagedBean.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotype.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.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/enterprise/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EventPayload.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonSimpleBean_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/tooManyObserverParameters/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Egg.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/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockPrice.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockWatcher.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/broken/observer/tooManyParameters/Boxer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/YorkshireTerrier_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Egg.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/observer/enterprise/Farmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/FarmerLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcher.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcherLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IntermediateStockWatcher.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmer.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmerLocal.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockPrice.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcher.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcherLocal.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 Log: implement and align more event tests w/ 20090519 spec repackage some tests Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java 2009-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/BullTerrier.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -7,12 +7,12 @@ private static boolean multiBindingEventObserved = false; private static boolean singleBindingEventObserved = false; - public void observesEvent(@Observes @Role("Admin") @Tame MultiBindingEvent someEvent) + public void observesMultiBindingEvent(@Observes @Role("Admin") @Tame MultiBindingEvent someEvent) { multiBindingEventObserved = true; } - public void observesMoreEvent(@Observes @Tame MultiBindingEvent someEvent) + public void observesSingleBindingEvent(@Observes @Tame MultiBindingEvent someEvent) { singleBindingEventObserved = true; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Egg.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Egg.java 2009-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Egg.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,6 +1,5 @@ package org.jboss.jsr299.tck.tests.event; -class Egg +class Egg extends EventPayload { - } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventPayload.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventPayload.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventPayload.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.event; + +import java.util.ArrayList; +import java.util.List; + +class EventPayload +{ + private List<Class<?>> classesVisited = new ArrayList<Class<?>>(); + + public List<Class<?>> getClassesVisited() + { + return classesVisited; + } + + public void recordVisit(Object o) + { + classesVisited.add(o.getClass()); + } +} 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-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -4,19 +4,13 @@ import java.util.ArrayList; import java.util.Set; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Event; import javax.enterprise.event.Observer; import javax.enterprise.inject.AnnotationLiteral; -import javax.enterprise.inject.TypeLiteral; -import javax.enterprise.inject.deployment.Standard; -import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.literals.AnyLiteral; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @@ -428,8 +422,8 @@ assert spider.getWeb().getRings() == 1; } - @Test(groups = { "events" }) - @SpecAssertion(section = "7.5.8", id = "p") // skipped + @Test(groups = { "events", "stub" }) + @SpecAssertion(section = "10.6.1", id = "p") public void testAsynchronousObserverThrowsExceptionIsLogged() throws Exception { new RunInDependentContext() @@ -446,8 +440,8 @@ }.run(); } - @Test(groups = { "stub", "events" }) - @SpecAssertion(section = "7.5.9", id = "a") // skipped + @Test(groups = { "events", "stub" }) + @SpecAssertion(section = "10.6.2", id = "a") public void testAsynchronousObserverMethodContexts() { assert false; @@ -485,107 +479,7 @@ }.run(); } - - // left off here - - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertion(section = "7.6", id = "h") - public void testNonBindingTypePassedToFireFails() throws Exception - { - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - OwlFinch_Broken bean = getInstanceByType(OwlFinch_Broken.class); - bean.methodThatFiresEvent(); - } - - }.run(); - } - - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertion(section = "7.6", id = "h") - public void testNonBindingTypePassedToObservesFails() throws Exception - { - new RunInDependentContext() - { - - @Override - protected void execute() throws Exception - { - OwlFinch_Broken bean = getInstanceByType(OwlFinch_Broken.class); - bean.methodThatRegistersObserver(); - } - - }.run(); - } - - @Test(groups = { "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.6", id = "n") } ) - public void testImplicitEventBeanMatchesAPITypeOfInectionPoint() throws Exception - { - // Retrieve the implicit event bean from the manager only by - // its API type - Set<?> eventBeans = getBeans(new TypeLiteral<Event<AnEventType>>() {}, new AnyLiteral()); - assert !eventBeans.isEmpty(); - } - - @Test(groups = { "events" }) - public void testImplicitEventHasAnyBinding() - { - Set<Bean<Event<AnEventType>>> eventBeans = getBeans(new TypeLiteral<Event<AnEventType>>() {}, new AnyLiteral()); - assert !eventBeans.isEmpty(); - assert eventBeans.iterator().next().getBindings().contains(new AnyLiteral()); - } - - @Test(groups = { "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.6", id = "n") } ) - public void testImplicitEventBeanMatchesBindingAnnotationsOfInjectionPoint() throws Exception - { - Set<?> eventBeans = getBeans(new TypeLiteral<Event<AnEventType>>(){}, new AnyLiteral(), new TameAnnotationLiteral(), new RoleBinding("Admin")); - assert !eventBeans.isEmpty(); - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.6", id = "o") - public void testImplicitEventBeanHasStandardDeploymentType() throws Exception - { - Set<?> eventBeans = getBeans(new TypeLiteral<Event<AnEventType>>() {}, new AnyLiteral()); - assert eventBeans.size() == 1; - Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); - assert eventBean.getDeploymentType().equals(Standard.class); - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.6", id = "p") - public void testImplicitEventBeanHasDependentScope() throws Exception - { - Set<?> eventBeans = getBeans(new TypeLiteral<Event<AnEventType>>() {}, new AnyLiteral()); - assert eventBeans.size() == 1; - Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); - assert eventBean.getScopeType().equals(Dependent.class); - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.6", id = "q") - public void testImplicitEventBeanHasNoName() throws Exception - { - Set<?> eventBeans = getBeans(new TypeLiteral<Event<AnEventType>>() {}, new AnyLiteral()); - assert eventBeans.size() == 1; - Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next(); - assert eventBean.getName() == null; - } - - @Test(groups = { "events" }) - @SpecAssertions( { @SpecAssertion(section = "7.6", id = "a"), @SpecAssertion(section = "7.6", id = "r") } ) - public void testImplicitEventBeanProvidedByContainer() throws Exception - { - Set<?> eventBeans = getBeans(new TypeLiteral<Event<AnEventType>>() {}, new AnyLiteral()); - assert eventBeans.size() == 1; - } - // 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) @@ -601,40 +495,19 @@ } @Test(groups = { "events", "underInvestigation" }) - @SpecAssertion(section = "7.6", id = "s") - public void testFireMethodCallsManagerFireWithBindingAnnotationsExceptFires() - { - assert false; - } - - @Test(groups = { "events", "underInvestigation" }) - @SpecAssertion(section = "7.6", id = "s") - public void testFireMethodCallsManagerFireWithAllBindingAnnotationInstances() - { - assert false; - } - - @Test(groups = { "events", "underInvestigation" }) - @SpecAssertions( { @SpecAssertion(section = "7.5.8", id = "s"), @SpecAssertion(section = "7.6", id = "u")} ) + @SpecAssertion(section = "11.2.7", id = "a") public void testObserverMethodCallsManagerAddObserverWithObserverObject() { assert false; } @Test(groups = { "events", "underInvestigation" }) - @SpecAssertion(section = "7.6", id = "u") + @SpecAssertion(section = "10.4.1", id = "ee") public void testObserverMethodCallsManagerAddObserverWithAllBindingAnnotationsExceptFires() { assert false; } - @Test(groups = { "events", "underInvestigation" }) - @SpecAssertion(section = "7.6", id = "u") - public void testObserverMethodCallsManagerAddObserverWithAllBindingAnnotationInstance() - { - assert false; - } - @Test(groups = { "events" }, expectedExceptions = IllegalArgumentException.class) @SpecAssertion(section = "11.2.9", id = "c") public void testEventObjectContainsTypeVariablesWhenResolvingFails() @@ -647,8 +520,8 @@ getCurrentManager().resolveObservers(eventToFire); } - @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) - @SpecAssertion(section = "7.7", id = "c") + @Test(groups = { "events", "ri-broken" }) + @SpecAssertion(section = "unknown", id = "unknown") public void testEventObjectContainsWildcardsWhenResolvingFails() { eventObjectContainsWildcards(new ArrayList<String>()); @@ -656,14 +529,15 @@ private void eventObjectContainsWildcards(ArrayList<?> eventToFire) { + // FIXME create a valid observer and assert it is found getCurrentManager().resolveObservers(eventToFire); } @Test(groups = { "events" }) @SpecAssertions( { - @SpecAssertion(section = "7.7.2", id = "b"), - @SpecAssertion(section = "7.7.2", id = "c") + @SpecAssertion(section = "10.2.2", id = "b"), + @SpecAssertion(section = "10.2.2", id = "c") } ) public void testObserverMethodNotifiedWhenBindingsMatch() { @@ -673,35 +547,56 @@ } @Test(groups = { "events", "stub" }) - @SpecAssertions( { @SpecAssertion(section = "7.8", id = "a") }) + @SpecAssertions( { @SpecAssertion(section = "10.7", id = "a") }) public void testEventTypeMappedToJmsTopic() { assert false; } @Test(groups = { "events", "stub" }) - @SpecAssertions( { @SpecAssertion(section = "7.8", id = "b") }) - public void testMultipleEventTypesMappedToSameJmsTopic() + @SpecAssertions( { @SpecAssertion(section = "10.7", id = "b") }) + public void testEventMappingIsObserverMethodDeclaredByInterface() { assert false; } @Test(groups = { "events", "stub" }) - @SpecAssertions( { @SpecAssertion(section = "7.8", id = "d") }) - public void testSerializedEventAndBindingsSentToJmsTopic() + @SpecAssertions( { @SpecAssertion(section = "10.7", id = "c") }) + public void testEventParameterSpecifiesMappedEventTypeAndBindings() { assert false; } + + @Test(groups = { "events", "stub" }) + @SpecAssertions( { @SpecAssertion(section = "10.7", id = "d") }) + public void testMessageDestinationInjectedIsMappedTopic() + { + assert false; + } + + @Test(groups = { "events", "stub" }) + @SpecAssertions( { @SpecAssertion(section = "10.7", id = "e") }) + public void testEventMappingMemberOfAnyInterface() + { + assert false; + } + + @Test(groups = { "events", "stub" }) + @SpecAssertions( { @SpecAssertion(section = "10.7", id = "f") }) + public void testObserversOfJmsTopicMustBeAsynchronous() + { + assert false; + } @Test(groups = { "events", "stub" }) - @SpecAssertions( { @SpecAssertion(section = "7.8", id = "e") }) + @SpecAssertions( { @SpecAssertion(section = "10.7", id = "g") }) public void testObserversNotifiedOfEventFromJmsTopic() { assert false; } @Test(groups = { "events", "stub" }) - @SpecAssertions( { @SpecAssertion(section = "7.8", id = "f") }) + @SpecAssertions( { @SpecAssertion(section = "10.7", id = "g") }) public void testEventsDistributedToProcessesWithSameTypeAndJmsTopic() { assert false; @@ -720,17 +615,18 @@ { new RunInDependentContext() { - @Override protected void execute() throws Exception { - Set<Observer<Egg>> observers = getCurrentManager().resolveObservers(new Egg()); + Egg egg = new Egg(); + Set<Observer<Egg>> observers = getCurrentManager().resolveObservers(egg); assert observers.size() == 1; // Notify the observer so we can confirm that it // is a method only on Farmer, and not LazyFarmer - observers.iterator().next().notify(new Egg()); - assert Farmer.getObserverClazz().equals(Farmer.class); + observers.iterator().next().notify(egg); + assert egg.getClassesVisited().size() == 1; + assert egg.getClassesVisited().iterator().next().equals(Farmer.class); } }.run(); @@ -742,18 +638,19 @@ { new RunInDependentContext() { - @Override protected void execute() throws Exception { - Set<Observer<StockPrice>> observers = getCurrentManager().resolveObservers(new StockPrice()); + StockPrice price = new StockPrice(); + Set<Observer<StockPrice>> observers = getCurrentManager().resolveObservers(price); assert observers.size() == 1; // Notify the observer so we can confirm that it // is a method only on StockWatcher, and not IntermediateStockWatcher // or IndirectStockWatcher - observers.iterator().next().notify(new StockPrice()); - assert StockWatcher.getObserverClazz().equals(StockWatcher.class); + observers.iterator().next().notify(price); + assert price.getClassesVisited().size() == 1; + assert price.getClassesVisited().iterator().next().equals(StockWatcher.class); } }.run(); Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Farmer.java 2009-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/Farmer.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -9,6 +9,7 @@ public void observeEggLaying(@Observes Egg egg) { observerClazz = this.getClass(); + egg.recordVisit(this); } public static Class<?> getObserverClazz() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockPrice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockPrice.java 2009-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockPrice.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,6 +1,5 @@ package org.jboss.jsr299.tck.tests.event; -class StockPrice +class StockPrice extends EventPayload { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockWatcher.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockWatcher.java 2009-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/StockWatcher.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -9,6 +9,7 @@ public void observeStockPrice(@Observes StockPrice price) { observerClazz = this.getClass(); + price.recordVisit(this); } public static Class<?> getObserverClazz() Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged (from rev 2903, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12) Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonManagedBean.java (from rev 2903, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/NonSimpleBean_Broken.java) =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonManagedBean.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonManagedBean.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.jsr299.tck.tests.event.broken.observer.beanNotManaged; + +import javax.enterprise.event.Observes; + +/** + * This class is not a bean since it does not have a default constructor + * nor does it have a constructor annotated with {@link @Initializer}. + * As such, an observer method is not detected on this class. + * + * @author David Allen + */ +class NonManagedBean +{ + public NonManagedBean(String name) + { + } + + public void observe(@Observes String event) + { + } +} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonSimpleBean_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer12/NonSimpleBean_Broken.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/NonSimpleBean_Broken.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jboss.jsr299.tck.tests.event.broken.observer12; - -import javax.enterprise.event.Observes; - -/** - * This bean is neither simple nor session. As such, an observer method is not - * allowed to be here. - * - * @author David Allen - * - */ -class NonSimpleBean_Broken -{ - public NonSimpleBean_Broken(String name) - { - - } - - public void observe(@Observes String event) - { - - } -} 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/observer12/ObserverMethodOnIncorrectBeanTest.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/beanNotManaged/ObserverMethodOnIncorrectBeanTest.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -9,31 +9,31 @@ * You may obtain a copy of the License at * http://www.apache.org/licenses/LICENSE-2.0 * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ +package org.jboss.jsr299.tck.tests.event.broken.observer.beanNotManaged; -package org.jboss.jsr299.tck.tests.event.broken.observer12; - import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; /** - * Tests an observer method on something that is not a simple bean - * or session bean. + * Tests an observer method on something that is not a managed bean + * or a session bean. * + * Spec version: 20090519 + * * @author David Allen - * */ @Artifact public class ObserverMethodOnIncorrectBeanTest extends AbstractJSR299Test { @Test(groups = { "events" }) - @SpecAssertion(section = "7.5", id = "b") + @SpecAssertion(section = "10.5", id = "b") public void testObserverMethodNotOnSimpleOrSessionBeanFails() { assert getCurrentManager().resolveObservers("event").isEmpty(); Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters (from rev 2903, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/tooManyObserverParameters) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/Boxer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/tooManyObserverParameters/Boxer.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/Boxer.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.event.broken.tooManyObserverParameters; +package org.jboss.jsr299.tck.tests.event.broken.observer.tooManyParameters; class Boxer { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/tooManyObserverParameters/ObserverMethodWithTwoEventParametersTest.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/ObserverMethodWithTwoEventParametersTest.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.event.broken.tooManyObserverParameters; +package org.jboss.jsr299.tck.tests.event.broken.observer.tooManyParameters; import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/YorkshireTerrier_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/tooManyObserverParameters/YorkshireTerrier_Broken.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer/tooManyParameters/YorkshireTerrier_Broken.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.event.broken.tooManyObserverParameters; +package org.jboss.jsr299.tck.tests.event.broken.observer.tooManyParameters; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterBeanDiscovery; Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotype.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotype.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotype.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.event.fires.nonbinding; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.stereotype.Stereotype; + +@Stereotype() +@Target( { TYPE, METHOD, FIELD }) +@Retention(RUNTIME) +@RequestScoped +@interface AnimalStereotype +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.event.fires.nonbinding; + +import javax.enterprise.inject.AnnotationLiteral; + +class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/NonBindingTypePassedToFireTest.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -0,0 +1,26 @@ +package org.jboss.jsr299.tck.tests.event.fires.nonbinding; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.testharness.impl.packaging.Artifact; +import org.testng.annotations.Test; + +@Artifact +public class NonBindingTypePassedToFireTest extends AbstractJSR299Test +{ + @Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class }) + @SpecAssertion(section = "11.2.8", id = "e") + public void testExceptionThrownIfNonBindingTypePassedToFire() throws Exception + { + new RunInDependentContext() + { + @Override + protected void execute() throws Exception + { + OwlFinch_Broken bean = getInstanceByType(OwlFinch_Broken.class); + bean.methodThatFiresEvent(); + } + + }.run(); + } +} Added: 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 (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/OwlFinch_Broken.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -0,0 +1,28 @@ +package org.jboss.jsr299.tck.tests.event.fires.nonbinding; + +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()); + } +} Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise (from rev 2903, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise) Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Egg.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/Egg.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Egg.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,6 +1,5 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; -class Egg +class Egg extends EventPayload { - } 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/enterprise/EnterpriseEventInheritenceTest.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,4 +1,4 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import java.util.Set; @@ -15,6 +15,8 @@ /** * Tests for event inheritence with enterprise beans * + * Spec version: 20090519 + * * @author Shane Bryzak */ @Artifact @@ -31,13 +33,15 @@ @Override protected void execute() throws Exception { - Set<Observer<Egg>> observers = getCurrentManager().resolveObservers(new Egg()); + Egg egg = new Egg(); + Set<Observer<Egg>> observers = getCurrentManager().resolveObservers(egg); assert observers.size() == 1; // Notify the observer so we can confirm that it // is a method only on Farmer, and not LazyFarmer - observers.iterator().next().notify(new Egg()); - assert Farmer.getObserverClazz().equals(Farmer.class); + observers.iterator().next().notify(egg); + assert egg.getClassesVisited().size() == 1; + assert egg.getClassesVisited().iterator().next().equals(Farmer.class); } }.run(); @@ -52,15 +56,17 @@ @Override protected void execute() throws Exception { - Set<Observer<StockPrice>> observers = getCurrentManager().resolveObservers(new StockPrice()); + StockPrice stockPrice = new StockPrice(); + Set<Observer<StockPrice>> observers = getCurrentManager().resolveObservers(stockPrice); assert observers.size() == 1; // Notify the observer so we can confirm that it // is a method only on StockWatcher, and not IndirectStockWatcher - observers.iterator().next().notify(new StockPrice()); - assert StockWatcher.getObserverClazz().equals(StockWatcher.class); + observers.iterator().next().notify(stockPrice); + assert stockPrice.getClassesVisited().size() == 1; + assert stockPrice.getClassesVisited().iterator().next().equals(StockWatcher.class); } }.run(); - } + } } Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EventPayload.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EventPayload.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EventPayload.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.event.observer.enterprise; + +import java.util.ArrayList; +import java.util.List; + +class EventPayload +{ + private List<Class<?>> classesVisited = new ArrayList<Class<?>>(); + + public List<Class<?>> getClassesVisited() + { + return classesVisited; + } + + public void recordVisit(Object o) + { + classesVisited.add(o.getClass()); + } +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Farmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/Farmer.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/Farmer.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,21 +1,13 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import javax.ejb.Stateful; import javax.enterprise.event.Observes; -@Stateful -public class Farmer implements FarmerLocal +public @Stateful class Farmer implements FarmerLocal { - private static Class<?> observerClazz; - public void observeEggLaying(@Observes Egg egg) { - observerClazz = this.getClass(); + egg.recordVisit(this); } - public static Class<?> getObserverClazz() - { - return observerClazz; - } - } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/FarmerLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/FarmerLocal.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/FarmerLocal.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,10 +1,9 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import javax.ejb.Local; import javax.enterprise.event.Observes; -@Local -public interface FarmerLocal +public @Local interface FarmerLocal { void observeEggLaying(@Observes Egg egg); } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcher.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/IndirectStockWatcher.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcher.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,9 +1,7 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import javax.ejb.Stateful; -@Stateful -public class IndirectStockWatcher extends IntermediateStockWatcher implements IndirectStockWatcherLocal +public @Stateful class IndirectStockWatcher extends IntermediateStockWatcher implements IndirectStockWatcherLocal { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcherLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/IndirectStockWatcherLocal.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IndirectStockWatcherLocal.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,9 +1,7 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import javax.ejb.Local; -@Local -public interface IndirectStockWatcherLocal +public @Local interface IndirectStockWatcherLocal { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IntermediateStockWatcher.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/IntermediateStockWatcher.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/IntermediateStockWatcher.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,6 +1,5 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; class IntermediateStockWatcher extends StockWatcher { - } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmer.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/LazyFarmer.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmer.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,9 +1,7 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import javax.ejb.Stateful; -@Stateful -public class LazyFarmer extends Farmer implements LazyFarmerLocal +public @Stateful class LazyFarmer extends Farmer implements LazyFarmerLocal { - } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmerLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/LazyFarmerLocal.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/LazyFarmerLocal.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,9 +1,7 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import javax.ejb.Local; -@Local -public interface LazyFarmerLocal +public @Local interface LazyFarmerLocal { - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockPrice.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/StockPrice.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockPrice.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,6 +1,5 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; -class StockPrice +class StockPrice extends EventPayload { - } \ No newline at end of file Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcher.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/StockWatcher.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcher.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,20 +1,13 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import javax.ejb.Stateful; import javax.enterprise.event.Observes; -@Stateful -public class StockWatcher implements StockWatcherLocal +public @Stateful class StockWatcher implements StockWatcherLocal { - private static Class<?> observerClazz; - public void observeStockPrice(@Observes StockPrice price) { - observerClazz = this.getClass(); + price.recordVisit(this); } - public static Class<?> getObserverClazz() - { - return observerClazz; - } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcherLocal.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/enterprise/StockWatcherLocal.java 2009-06-26 17:12:22 UTC (rev 2903) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/StockWatcherLocal.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,10 +1,9 @@ -package org.jboss.jsr299.tck.tests.event.enterprise; +package org.jboss.jsr299.tck.tests.event.observer.enterprise; import javax.ejb.Local; import javax.enterprise.event.Observes; -@Local -public interface StockWatcherLocal +public @Local interface StockWatcherLocal { void observeStockPrice(@Observes StockPrice price); } 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-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeMembersTest.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -10,6 +10,9 @@ import org.jboss.testharness.impl.packaging.Artifact; import org.testng.annotations.Test; +/** + * Spec version: 20090519 + */ @Artifact public class ResolvingChecksBindingTypeMembersTest extends AbstractJSR299Test { Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java 2009-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/ResolvingChecksBindingTypeTest.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -1,43 +0,0 @@ -package org.jboss.jsr299.tck.tests.event.resolve.binding; - -import java.util.Set; - -import javax.enterprise.event.Observer; - -import org.hibernate.tck.annotations.SpecAssertion; -import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.testharness.impl.packaging.Artifact; -import org.testng.annotations.Test; - -@Artifact -public class ResolvingChecksBindingTypeTest extends AbstractJSR299Test -{ - public static class AnEventType - { - } - - public static class AnObserver implements Observer<AnEventType> - { - public boolean wasNotified = false; - - public boolean notify(AnEventType event) - { - wasNotified = true; - return false; - } - } - - @Test(groups = { "events" }) - @SpecAssertion(section = "7.7", id = "g") - public void testResolvingChecksBindingTypes() - { - AnObserver observer = new AnObserver(); - AnObserver anotherObserver = new AnObserver(); - getCurrentManager().addObserver(observer, new BindingTypeABinding()); - getCurrentManager().addObserver(anotherObserver, new BindingTypeBBinding()); - Set<Observer<AnEventType>> resolvedObservers = getCurrentManager().resolveObservers(new AnEventType(), new BindingTypeABinding()); - assert resolvedObservers.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-06-26 20:10:55 UTC (rev 2906) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-06-26 21:52:51 UTC (rev 2907) @@ -37,6 +37,5 @@ AnObserver observer = new AnObserver(); getCurrentManager().addObserver(observer); Set<Observer<AnEventType>> resolvedObservers = getCurrentManager().resolveObservers(new AnEventType(), new AnimalStereotypeAnnotationLiteral()); - assert !resolvedObservers.isEmpty(); } }