Author: dallen6
Date: 2009-08-03 18:03:52 -0400 (Mon, 03 Aug 2009)
New Revision: 3397
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/AnimalStereotype.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Transactional.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/NonBindingType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Secure.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/SecureInterceptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/ShoppingCart.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Transactional.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/TransactionalInterceptor.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Interceptor1.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorType1.java
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/DerivedBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
More tests for ch. 11 and removed unused method from BeanManagerImpl.
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-08-03
20:31:21 UTC (rev 3396)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-08-03
22:03:52 UTC (rev 3397)
@@ -1316,12 +1316,6 @@
throw new UnsupportedOperationException("Not yet implemented");
}
- @Deprecated
- public <X> Bean<? extends X> getHighestPrecedenceBean(Set<Bean<?
extends X>> beans)
- {
- return resolve(beans);
- }
-
public ELResolver getELResolver()
{
return webbeansELResolver;
Copied:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/AnimalStereotype.java
(from rev 3393,
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/AnimalStereotype.java)
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/AnimalStereotype.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/AnimalStereotype.java 2009-08-03
22:03:52 UTC (rev 3397)
@@ -0,0 +1,23 @@
+package org.jboss.jsr299.tck.tests.extensions.beanManager;
+
+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.Inherited;
+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
+@Inherited
+@interface AnimalStereotype
+{
+
+}
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-08-03
20:31:21 UTC (rev 3396)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-08-03
22:03:52 UTC (rev 3397)
@@ -17,14 +17,28 @@
package org.jboss.jsr299.tck.tests.extensions.beanManager;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
import java.util.HashSet;
import java.util.Set;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.ScopeType;
import javax.enterprise.inject.AmbiguousResolutionException;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.BindingType;
import javax.enterprise.inject.InjectionException;
+import javax.enterprise.inject.Specializes;
+import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.inject.spi.InjectionTarget;
import javax.enterprise.inject.spi.PassivationCapable;
+import javax.enterprise.inject.stereotype.Stereotype;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
@@ -88,4 +102,93 @@
// Wrap the injection point to change the type to a more generalized class
getCurrentManager().validate(injectionPoint);
}
+
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "11.3.14", id = "aa")
+ public void testDetermineBindingType()
+ {
+ assert getCurrentManager().isBindingType(Tame.class);
+ }
+
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "11.3.14", id = "ab")
+ public void testDetermineScopeType()
+ {
+ assert getCurrentManager().isScopeType(ApplicationScoped.class);
+ }
+
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "11.3.14", id = "ac")
+ public void testDetermineStereotype()
+ {
+ assert getCurrentManager().isBindingType(AnimalStereotype.class);
+ }
+
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "11.3.14", id = "ad")
+ public void testDetermineInterceptorBindingType()
+ {
+ assert getCurrentManager().isInterceptorBindingType(Transactional.class);
+ }
+
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "11.3.14", id = "ae")
+ public void testGetMetaAnnotationsForStereotype()
+ {
+ Set<Annotation> stereotypeAnnotations =
getCurrentManager().getStereotypeDefinition(AnimalStereotype.class);
+ assert stereotypeAnnotations.size() == 5;
+ assert stereotypeAnnotations.contains(new AnnotationLiteral<Stereotype>()
{});
+ assert stereotypeAnnotations.contains(new AnnotationLiteral<Target>() {});
+ assert stereotypeAnnotations.contains(new AnnotationLiteral<Retention>()
{});
+ assert stereotypeAnnotations.contains(new AnnotationLiteral<RequestScoped>()
{});
+ assert stereotypeAnnotations.contains(new AnnotationLiteral<Inherited>()
{});
+ }
+
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "11.3.14", id = "af")
+ public void testGetMetaAnnotationsForInterceptorBindingType()
+ {
+ Set<Annotation> metaAnnotations =
getCurrentManager().getInterceptorBindingTypeDefinition(Transactional.class);
+ assert metaAnnotations.size() == 4;
+ assert metaAnnotations.contains(new AnnotationLiteral<Target>() {});
+ assert metaAnnotations.contains(new AnnotationLiteral<Retention>() {});
+ assert metaAnnotations.contains(new AnnotationLiteral<Documented>() {});
+ assert metaAnnotations.contains(new AnnotationLiteral<BindingType>() {});
+ }
+
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "11.3.14", id = "ag")
+ public void testGetScopeType()
+ {
+ ScopeType scopeType = getCurrentManager().getScopeDefinition(RequestScoped.class);
+ assert scopeType.normal();
+ assert scopeType.passivating();
+ }
+
+ @Test
+ @SpecAssertion(section = "11.3.16", id = "a")
+ public void testGetELResolver()
+ {
+ assert getCurrentManager().getELResolver() != null;
+ }
+
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "11.3.17", id = "a")
+ public void testObtainingAnnotatedType()
+ {
+ AnnotatedType<?> annotatedType =
getCurrentManager().createAnnotatedType(DerivedBean.class);
+ assert annotatedType.isAnnotationPresent(Specializes.class);
+ assert annotatedType.isAnnotationPresent(Tame.class);
+ assert annotatedType.getFields().size() == 1;
+ assert annotatedType.getMethods().isEmpty();
+ assert annotatedType.getTypeClosure().size() == 3;
+ }
+
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "11.3.18", id = "aa")
+ public void testObtainingInjectionTarget()
+ {
+ AnnotatedType<?> annotatedType =
getCurrentManager().createAnnotatedType(DerivedBean.class);
+ assert getCurrentManager().createInjectionTarget(annotatedType) != null;
+ }
}
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/DerivedBean.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/DerivedBean.java 2009-08-03
20:31:21 UTC (rev 3396)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/DerivedBean.java 2009-08-03
22:03:52 UTC (rev 3397)
@@ -5,5 +5,5 @@
@Specializes @Tame
class DerivedBean extends SimpleBean
{
-
+ protected int simpleField;
}
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Transactional.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Transactional.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Transactional.java 2009-08-03
22:03:52 UTC (rev 3397)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.extensions.beanManager;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Transactional
+{
+
+}
Property changes on:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/Transactional.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Interceptor1.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Interceptor1.java 2009-08-03
20:31:21 UTC (rev 3396)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Interceptor1.java 2009-08-03
22:03:52 UTC (rev 3397)
@@ -1,13 +0,0 @@
-package org.jboss.jsr299.tck.tests.interceptors.definition;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.InvocationContext;
-
-@InterceptorType1
-class Interceptor1
-{
- @AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception
- {
- return ctx.proceed();
- }
-}
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-08-03
20:31:21 UTC (rev 3396)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-08-03
22:03:52 UTC (rev 3397)
@@ -17,10 +17,14 @@
package org.jboss.jsr299.tck.tests.interceptors.definition;
+import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.InterceptionType;
import javax.enterprise.inject.spi.Interceptor;
import org.jboss.jsr299.tck.AbstractJSR299Test;
@@ -49,7 +53,7 @@
public void testInterceptorsImplementInterceptorInterface()
{
boolean interfaceFound = false;
- for (Type type :
getInterfacesImplemented(getBeans(Interceptor1.class).iterator().next().getClass()))
+ for (Type type :
getInterfacesImplemented(getBeans(TransactionalInterceptor.class).iterator().next().getClass()))
{
if (type.equals(Interceptor.class))
{
@@ -66,4 +70,53 @@
interfaces.addAll(new HierarchyDiscovery(clazz).getFlattenedTypes());
return interfaces;
}
+
+ @Test(groups = "ri-broken")
+ @SpecAssertions({
+ @SpecAssertion(section = "11.3.13", id = "a")
+ })
+ public void testResolveInterceptorsReturnsOrderedList()
+ {
+ Annotation transactionalBinding = new AnnotationLiteral<Transactional>() {};
+ Annotation secureBinding = new AnnotationLiteral<Secure>() {};
+ List<Interceptor<?>> interceptors =
getCurrentManager().resolveInterceptors(
+ InterceptionType.AROUND_INVOKE,
+ transactionalBinding,
+ secureBinding
+ );
+ assert interceptors.size() == 2;
+ assert interceptors.get(0).getInterceptorBindingTypes().size() == 1;
+ assert
interceptors.get(0).getInterceptorBindingTypes().contains(transactionalBinding);
+ assert interceptors.get(1).getInterceptorBindingTypes().size() == 1;
+ assert interceptors.get(1).getInterceptorBindingTypes().contains(secureBinding);
+ }
+
+ @Test(groups = "ri-broken")
+ @SpecAssertions({
+ @SpecAssertion(section = "11.3.13", id = "b")
+ })
+ public void testSameBindingTypesToResolveInterceptorsFails()
+ {
+ Annotation transactionalBinding = new AnnotationLiteral<Transactional>() {};
+ getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE,
transactionalBinding, transactionalBinding);
+ }
+
+ @Test(groups = "ri-broken")
+ @SpecAssertions({
+ @SpecAssertion(section = "11.3.13", id = "c")
+ })
+ public void testNoBindingTypesToResolveInterceptorsFails()
+ {
+ getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE);
+ }
+
+ @Test(groups = "ri-broken")
+ @SpecAssertions({
+ @SpecAssertion(section = "11.3.13", id = "d")
+ })
+ public void testNonBindingTypeToResolveInterceptorsFails()
+ {
+ Annotation nonBinding = new AnnotationLiteral<NonBindingType>() {};
+ getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE,
nonBinding);
+ }
}
Deleted:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorType1.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorType1.java 2009-08-03
20:31:21 UTC (rev 3396)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorType1.java 2009-08-03
22:03:52 UTC (rev 3397)
@@ -1,18 +0,0 @@
-package org.jboss.jsr299.tck.tests.interceptors.definition;
-
-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.interceptor.Interceptor;
-
-@Target({TYPE, METHOD})
-@Retention(RUNTIME)
-@Interceptor
-@interface InterceptorType1
-{
-
-}
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/NonBindingType.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/NonBindingType.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/NonBindingType.java 2009-08-03
22:03:52 UTC (rev 3397)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@interface NonBindingType
+{
+
+}
Property changes on:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/NonBindingType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Secure.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Secure.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Secure.java 2009-08-03
22:03:52 UTC (rev 3397)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Secure
+{
+
+}
Property changes on:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Secure.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/SecureInterceptor.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/SecureInterceptor.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/SecureInterceptor.java 2009-08-03
22:03:52 UTC (rev 3397)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Secure @Interceptor
+class SecureInterceptor
+{
+ @AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception
+ {
+ return ctx.proceed();
+ }
+
+}
Property changes on:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/SecureInterceptor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/ShoppingCart.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/ShoppingCart.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/ShoppingCart.java 2009-08-03
22:03:52 UTC (rev 3397)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition;
+
+@Transactional @Secure
+class ShoppingCart
+{
+ public void placeOrder()
+ {
+
+ }
+}
Property changes on:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/ShoppingCart.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Transactional.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Transactional.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Transactional.java 2009-08-03
22:03:52 UTC (rev 3397)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Transactional
+{
+
+}
Property changes on:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Transactional.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/TransactionalInterceptor.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/TransactionalInterceptor.java
(rev 0)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/TransactionalInterceptor.java 2009-08-03
22:03:52 UTC (rev 3397)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Transactional @Interceptor
+class TransactionalInterceptor
+{
+ @AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception
+ {
+ return ctx.proceed();
+ }
+
+}
Property changes on:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/TransactionalInterceptor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-03 20:31:21 UTC (rev 3396)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-08-03 22:03:52 UTC (rev 3397)
@@ -4549,9 +4549,33 @@
</section>
<section id="11.3.14" title="Determining if an annotation is a
binding type, scope type, stereotype or interceptor binding type">
- <assertion id="a">
- <text>A portable extension may test an annotation to determine if it is a
binding type, scope type, stereotype or interceptor binding type, obtain the set of
meta-annotations declared by a stereotype or interceptor binding type, or obtain a
|ScopeType| representing a scope type.</text>
+ <assertion id="aa">
+ <text>A portable extension may test an annotation to determine if it is a
_binding type_, scope type, stereotype or interceptor binding type, obtain the set of
meta-annotations declared by a stereotype or interceptor binding type, or obtain a
|ScopeType| representing a scope type.</text>
</assertion>
+
+ <assertion id="ab">
+ <text>A portable extension may test an annotation to determine if it is a
binding type, _scope type_, stereotype or interceptor binding type, obtain the set of
meta-annotations declared by a stereotype or interceptor binding type, or obtain a
|ScopeType| representing a scope type.</text>
+ </assertion>
+
+ <assertion id="ac">
+ <text>A portable extension may test an annotation to determine if it is a
binding type, scope type, _stereotype_ or interceptor binding type, obtain the set of
meta-annotations declared by a stereotype or interceptor binding type, or obtain a
|ScopeType| representing a scope type.</text>
+ </assertion>
+
+ <assertion id="ad">
+ <text>A portable extension may test an annotation to determine if it is a
binding type, scope type, stereotype or _interceptor binding type_, obtain the set of
meta-annotations declared by a stereotype or interceptor binding type, or obtain a
|ScopeType| representing a scope type.</text>
+ </assertion>
+
+ <assertion id="ae">
+ <text>A portable extension may test an annotation to determine if it is a
binding type, scope type, stereotype or interceptor binding type, obtain the set of
meta-annotations declared by a _stereotype_ or interceptor binding type, or obtain a
|ScopeType| representing a scope type.</text>
+ </assertion>
+
+ <assertion id="af">
+ <text>A portable extension may test an annotation to determine if it is a
binding type, scope type, stereotype or interceptor binding type, obtain the set of
meta-annotations declared by a stereotype or _interceptor binding type_, or obtain a
|ScopeType| representing a scope type.</text>
+ </assertion>
+
+ <assertion id="ag">
+ <text>A portable extension may test an annotation to determine if it is a
binding type, scope type, stereotype or interceptor binding type, obtain the set of
meta-annotations declared by a stereotype or interceptor binding type, or obtain a
_|ScopeType| representing a scope type_.</text>
+ </assertion>
</section>
<section id="11.3.15" title="Obtaining the active Context for a
scope">
@@ -4573,9 +4597,13 @@
</section>
<section id="11.3.18" title="Obtaining an InjectionTarget">
- <assertion id="a">
- <text>The method |BeanManager.createInjectionTarget()| returns a container
provided implementation of |InjectionTarget| for a given |AnnotatedType| or throws an
|IllegalArgumentException| if there is a definition error associated with any injection
point of the type.</text>
+ <assertion id="aa">
+ <text>The method |BeanManager.createInjectionTarget()| returns a container
provided implementation of |InjectionTarget| for a given |AnnotatedType| ~or throws an
|IllegalArgumentException| if there is a definition error associated with any injection
point of the type~.</text>
</assertion>
+
+ <assertion id="ab">
+ <text>The method |BeanManager.createInjectionTarget()| ~returns a container
provided implementation of |InjectionTarget| for a given |AnnotatedType|~ or throws an
|IllegalArgumentException| if there is a definition error associated with any injection
point of the type.</text>
+ </assertion>
</section>
<section id="11.4" title="Alternative metadata sources">