Author: pete.muir(a)jboss.org Date: 2009-11-01 11:24:39 -0500 (Sun, 01 Nov 2009) New Revision: 4513 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorImplementation.java Log: WELD-241, WELD-242 Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-11-01 16:17:16 UTC (rev 4512) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/EventTest.java 2009-11-01 16:24:39 UTC (rev 4513) @@ -111,7 +111,7 @@ public void testNonStaticObserverMethodNotInherited() { Egg egg = new Egg(); - Set<ObserverMethod<Egg>> observers = getCurrentManager().resolveObserverMethods(egg); + Set<ObserverMethod<? super Egg>> observers = getCurrentManager().resolveObserverMethods(egg); assert observers.size() == 1; // Reception the observer so we can confirm that it @@ -129,7 +129,7 @@ public void testNonStaticObserverMethodNotIndirectlyInherited() { StockPrice price = new StockPrice(); - Set<ObserverMethod<StockPrice>> observers = getCurrentManager().resolveObserverMethods(price); + Set<ObserverMethod<? super StockPrice>> observers = getCurrentManager().resolveObserverMethods(price); assert observers.size() == 1; // Reception the observer so we can confirm that it Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-11-01 16:17:16 UTC (rev 4512) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/ObserverTest.java 2009-11-01 16:24:39 UTC (rev 4513) @@ -52,9 +52,9 @@ @SpecAssertion(section = "11.1.3", id = "b") public void testGetBeanOnObserverMethod() { - Set<ObserverMethod<StockPrice>> observers = getCurrentManager().resolveObserverMethods(new StockPrice()); + Set<ObserverMethod<? super StockPrice>> observers = getCurrentManager().resolveObserverMethods(new StockPrice()); assert observers.size() == 1; - ObserverMethod<StockPrice> observerMethod = observers.iterator().next(); + ObserverMethod<? super StockPrice> observerMethod = observers.iterator().next(); assert observerMethod.getBeanClass().equals(StockWatcher.class); } @@ -62,7 +62,7 @@ @SpecAssertion(section = "11.1.3", id = "c") public void testGetObservedTypeOnObserverMethod() { - Set<ObserverMethod<StockPrice>> observers = getCurrentManager().resolveObserverMethods(new StockPrice()); + Set<ObserverMethod<? super StockPrice>> observers = getCurrentManager().resolveObserverMethods(new StockPrice()); assert observers.size() == 1; ObserverMethod<?> observerMethod = observers.iterator().next(); assert observerMethod.getObservedType().equals(StockPrice.class); @@ -72,7 +72,7 @@ @SpecAssertion(section = "11.1.3", id = "c") public void testGetObservedBindingsOnObserverMethod() { - Set<ObserverMethod<StockPrice>> observers = getCurrentManager().resolveObserverMethods(new StockPrice()); + Set<ObserverMethod<? super StockPrice>> observers = getCurrentManager().resolveObserverMethods(new StockPrice()); assert observers.size() == 1; ObserverMethod<?> observerMethod = observers.iterator().next(); assert observerMethod.getObservedQualifiers().size() == 1; @@ -83,11 +83,11 @@ @SpecAssertion(section = "11.1.3", id = "d") public void testGetNotifyOnObserverMethod() { - Set<ObserverMethod<StockPrice>> observers = getCurrentManager().resolveObserverMethods(new StockPrice()); + Set<ObserverMethod<? super StockPrice>> observers = getCurrentManager().resolveObserverMethods(new StockPrice()); assert observers.size() == 1; assert observers.iterator().next().getReception().equals(Reception.ALWAYS); - Set<ObserverMethod<ConditionalEvent>> conditionalObservers = getCurrentManager().resolveObserverMethods(new ConditionalEvent()); + Set<ObserverMethod<? super ConditionalEvent>> conditionalObservers = getCurrentManager().resolveObserverMethods(new ConditionalEvent()); assert !conditionalObservers.isEmpty(); assert conditionalObservers.iterator().next().getReception().equals(Reception.IF_EXISTS); } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-11-01 16:17:16 UTC (rev 4512) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/enterprise/EnterpriseEventInheritenceTest.java 2009-11-01 16:24:39 UTC (rev 4513) @@ -29,7 +29,7 @@ public void testNonStaticObserverMethodNotInherited() throws Exception { Egg egg = new Egg(); - Set<ObserverMethod<Egg>> observers = getCurrentManager().resolveObserverMethods(egg); + Set<ObserverMethod<? super Egg>> observers = getCurrentManager().resolveObserverMethods(egg); assert observers.size() == 1; // Reception the observer so we can confirm that it @@ -44,7 +44,7 @@ public void testNonStaticObserverMethodNotIndirectlyInherited() throws Exception { StockPrice stockPrice = new StockPrice(); - Set<ObserverMethod<StockPrice>> observers = getCurrentManager().resolveObserverMethods(stockPrice); + Set<ObserverMethod<? super StockPrice>> observers = getCurrentManager().resolveObserverMethods(stockPrice); assert observers.size() == 1; // Reception the observer so we can confirm that it Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java 2009-11-01 16:17:16 UTC (rev 4512) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java 2009-11-01 16:24:39 UTC (rev 4513) @@ -40,9 +40,9 @@ @SpecAssertion(section = "10.4.2", id = "a") public void testMethodWithParameterAnnotatedWithObservesRegistersObserverMethod() throws SecurityException, NoSuchMethodException { - Set<ObserverMethod<Temperature>> temperatureObservers = getCurrentManager().resolveObserverMethods(new Temperature(0d)); + Set<ObserverMethod<? super Temperature>> temperatureObservers = getCurrentManager().resolveObserverMethods(new Temperature(0d)); assert temperatureObservers.size() == 1; - ObserverMethod<Temperature> temperatureObserver = temperatureObservers.iterator().next(); + ObserverMethod<? super Temperature> temperatureObserver = temperatureObservers.iterator().next(); assert temperatureObserver.getBeanClass().equals(AirConditioner.class); assert temperatureObserver.getObservedType().equals(Temperature.class); @@ -103,12 +103,12 @@ @SpecAssertion(section = "12.3", id = "o") public void testObserverMethodNotAutomaticallyRegisteredForDisabledBeans() { - Set<ObserverMethod<Ghost>> ghostObservers = getCurrentManager().resolveObserverMethods(new Ghost()); + Set<ObserverMethod<? super Ghost>> ghostObservers = getCurrentManager().resolveObserverMethods(new Ghost()); assert ghostObservers.size() == 0; - Set<ObserverMethod<String>> stringObservers = getCurrentManager().resolveObserverMethods(new String(), new AnnotationLiteral<Secret>() {}); + Set<ObserverMethod<? super String>> stringObservers = getCurrentManager().resolveObserverMethods(new String(), new AnnotationLiteral<Secret>() {}); assert stringObservers.size() == 1; - for (ObserverMethod<String> observer : stringObservers) + for (ObserverMethod<? super String> observer : stringObservers) { // an assertion error will be raised if an inappropriate observer is called observer.notify("fail if disabled observer invoked"); Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-11-01 16:17:16 UTC (rev 4512) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/NonBindingTypesWhenResolvingTest.java 2009-11-01 16:24:39 UTC (rev 4513) @@ -33,6 +33,6 @@ @SpecAssertion(section = "11.3.11", id = "e") public void testNonBindingTypeAnnotationWhenResolvingFails() { - Set<ObserverMethod<AnEventType>> resolvedObservers = getCurrentManager().resolveObserverMethods(new AnEventType(), new AnimalStereotypeAnnotationLiteral()); + Set<ObserverMethod<? super AnEventType>> resolvedObservers = getCurrentManager().resolveObserverMethods(new AnEventType(), new AnimalStereotypeAnnotationLiteral()); } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-11-01 16:17:16 UTC (rev 4512) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-11-01 16:24:39 UTC (rev 4513) @@ -78,8 +78,8 @@ public void testInterceptorBindingTypes() { Interceptor<?> interceptorBean = getTransactionalInterceptor(); - assert interceptorBean.getInterceptorBindingTypes().size() == 1; - assert interceptorBean.getInterceptorBindingTypes().contains(new AnnotationLiteral<Transactional>(){}); + assert interceptorBean.getInterceptorBindings().size() == 1; + assert interceptorBean.getInterceptorBindings().contains(new AnnotationLiteral<Transactional>(){}); } @Test(groups="rewrite") @@ -160,10 +160,10 @@ secureBinding ); assert interceptors.size() == 2; - assert interceptors.get(0).getInterceptorBindingTypes().size() == 1; - assert interceptors.get(0).getInterceptorBindingTypes().contains(secureBinding); - assert interceptors.get(1).getInterceptorBindingTypes().size() == 1; - assert interceptors.get(1).getInterceptorBindingTypes().contains(transactionalBinding); + assert interceptors.get(0).getInterceptorBindings().size() == 1; + assert interceptors.get(0).getInterceptorBindings().contains(secureBinding); + assert interceptors.get(1).getInterceptorBindings().size() == 1; + assert interceptors.get(1).getInterceptorBindings().contains(transactionalBinding); } @Test(expectedExceptions = {IllegalArgumentException.class}) @@ -255,10 +255,10 @@ assert interceptors.size() > 1; Interceptor<?> interceptorBean = interceptors.iterator().next(); - assert interceptorBean.getInterceptorBindingTypes().size() == 1; - assert interceptorBean.getInterceptorBindingTypes().contains(new AnnotationLiteral<Logged>(){}); + assert interceptorBean.getInterceptorBindings().size() == 1; + assert interceptorBean.getInterceptorBindings().contains(new AnnotationLiteral<Logged>(){}); - Target target = (interceptorBean.getInterceptorBindingTypes().iterator().next()).annotationType().getAnnotation(Target.class); + Target target = (interceptorBean.getInterceptorBindings().iterator().next()).annotationType().getAnnotation(Target.class); List<ElementType> elements = Arrays.asList(target.value()); assert elements.contains(ElementType.TYPE); assert elements.contains(ElementType.METHOD); Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorImplementation.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorImplementation.java 2009-11-01 16:17:16 UTC (rev 4512) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/custom/CustomInterceptorImplementation.java 2009-11-01 16:24:39 UTC (rev 4513) @@ -29,7 +29,7 @@ }); } - public Set<Annotation> getInterceptorBindingTypes() + public Set<Annotation> getInterceptorBindings() { return Collections.unmodifiableSet(interceptorBindingTypes); }