[webbeans-commits] Webbeans SVN: r3582 - in tck/trunk/impl/src/main: resources/org/jboss/jsr299/tck/tests/interceptors/definition and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2009-08-22 01:11:05 -0400 (Sat, 22 Aug 2009)
New Revision: 3582

Added:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/AtomicFoo.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/AtomicInterceptor.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileBinding.java
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/beans.xml
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/Missile.java
Log:
test for 9.1.1.a


Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Atomic.java	2009-08-22 05:11:05 UTC (rev 3582)
@@ -0,0 +1,23 @@
+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.interceptor.InterceptorBindingType;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at MissileBinding
+ at InterceptorBindingType
+ at interface Atomic
+{
+
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/AtomicFoo.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/AtomicFoo.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/AtomicFoo.java	2009-08-22 05:11:05 UTC (rev 3582)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition;
+
+class AtomicFoo
+{
+   @Atomic void doAction() {}
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/AtomicInterceptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/AtomicInterceptor.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/AtomicInterceptor.java	2009-08-22 05:11:05 UTC (rev 3582)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+ at Atomic @Interceptor
+class AtomicInterceptor
+{
+   public static boolean intercepted = false;
+   
+   @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-22 03:26:20 UTC (rev 3581)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java	2009-08-22 05:11:05 UTC (rev 3582)
@@ -231,5 +231,19 @@
    {      
       Bean<SecureTransaction> bean = getBeans(SecureTransaction.class).iterator().next();
       assert bean.getBindings().contains(Logged.class);            
-   }   
+   }
+ 
+   @Test(groups = "ri-broken")
+   @SpecAssertion(section = "9.1.1", id = "a")
+   public void testInterceptorBindingsCanDeclareOtherInterceptorBindings()
+   {
+      AtomicInterceptor.intercepted = false;
+      MissileInterceptor.intercepted = false;
+      
+      AtomicFoo foo = getInstanceByType(AtomicFoo.class);
+      foo.doAction();
+      
+      assert AtomicInterceptor.intercepted;
+      assert MissileInterceptor.intercepted;
+   }
 }

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Missile.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Missile.java	2009-08-22 03:26:20 UTC (rev 3581)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Missile.java	2009-08-22 05:11:05 UTC (rev 3582)
@@ -3,7 +3,7 @@
 import javax.enterprise.inject.Initializer;
 import javax.interceptor.Interceptors;
 
- at Interceptors(MissileInterceptor.class)
+ at MissileBinding
 class Missile
 {
    @Initializer

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileBinding.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/MissileBinding.java	2009-08-22 05:11:05 UTC (rev 3582)
@@ -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.interceptor.InterceptorBindingType;
+
+ at Target( { TYPE, METHOD, PARAMETER, FIELD })
+ at Retention(RUNTIME)
+ at Documented
+ at InterceptorBindingType
+ at interface MissileBinding
+{
+
+}

Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/beans.xml	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/beans.xml	2009-08-22 05:11:05 UTC (rev 3582)
@@ -0,0 +1,8 @@
+<beans> 
+  <interceptors>
+    <class>org.jboss.jsr299.tck.tests.interceptors.definition.AtomicInterceptor</class>
+    <class>org.jboss.jsr299.tck.tests.interceptors.definition.MissileInterceptor</class>
+    <class>org.jboss.jsr299.tck.tests.interceptors.definition.SecureInterceptor</class>
+    <class>org.jboss.jsr299.tck.tests.interceptors.definition.TransactionalInterceptor</class>
+  </interceptors>
+</beans>