[weld-commits] Weld SVN: r4932 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder and 6 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Mon Nov 9 22:14:14 EST 2009
Author: marius.bogoevici
Date: 2009-11-09 22:14:14 -0500 (Mon, 09 Nov 2009)
New Revision: 4932
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/Airborne.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/Missile.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/MissileInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/MissileLocal.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/RadarInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/SessionBeanInterceptorOrderTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/Airborne.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/Missile.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/MissileInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/MissileLocal.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/SessionBeanInterceptorDefinitionTest.java
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/beans.xml
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/beans.xml
Removed:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/Airborne.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/Missile.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/MissileInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/MissileLocal.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/beans.xml
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java
cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
Log:
Split assertion 9.4 f into fa (with managed bean) and fb (with session bean) as the mechanisms to implement interception on EJBs are different from session beans.
Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/Airborne.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/Airborne.java 2009-11-10 03:07:46 UTC (rev 4931)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/Airborne.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -1,19 +0,0 @@
-package org.jboss.jsr299.tck.tests.interceptors.definition.enterprise;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Documented;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.ElementType.METHOD;
-
-import javax.interceptor.InterceptorBinding;
-
- at Target( { TYPE, METHOD})
- at Retention(RUNTIME)
- at Documented
- at InterceptorBinding
-public @interface Airborne
-{
-
-}
\ No newline at end of file
Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/Missile.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/Missile.java 2009-11-10 03:07:46 UTC (rev 4931)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/Missile.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.tests.interceptors.definition.enterprise;
-
-import javax.ejb.Stateful;
-import javax.interceptor.Interceptors;
-
- at Stateful
- at Airborne
-public class Missile implements MissileLocal
-{
- public void fire() {}
-}
Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/MissileInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/MissileInterceptor.java 2009-11-10 03:07:46 UTC (rev 4931)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/MissileInterceptor.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -1,19 +0,0 @@
-package org.jboss.jsr299.tck.tests.interceptors.definition.enterprise;
-
-import java.io.Serializable;
-
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
-
- at Interceptor @Airborne
-class MissileInterceptor implements Serializable
-{
- public static boolean intercepted = false;
-
- @AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception
- {
- intercepted = true;
- return ctx.proceed();
- }
-}
Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/MissileLocal.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/MissileLocal.java 2009-11-10 03:07:46 UTC (rev 4931)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/MissileLocal.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -1,9 +0,0 @@
-package org.jboss.jsr299.tck.tests.interceptors.definition.enterprise;
-
-import javax.ejb.Local;
-
- at Local
-public interface MissileLocal
-{
- void fire();
-}
Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java 2009-11-10 03:07:46 UTC (rev 4931)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -1,32 +0,0 @@
-package org.jboss.jsr299.tck.tests.interceptors.definition.enterprise;
-
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.test.audit.annotations.SpecAssertion;
-import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.IntegrationTest;
-import org.jboss.testharness.impl.packaging.Packaging;
-import org.jboss.testharness.impl.packaging.PackagingType;
-import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
-import org.testng.annotations.Test;
-
-
- at IntegrationTest
- at Artifact
- at Packaging(PackagingType.EAR)
- at SpecVersion(spec="cdi", version="20091101")
- at BeansXml("beans.xml")
-public class SessionBeanInterceptorDefinitionTest extends AbstractJSR299Test
-{
- @Test(groups = "jboss-as-broken")
- @SpecAssertion(section = "7.2", id = "c")
- public void testSessionBeanIsIntercepted()
- {
- MissileInterceptor.intercepted = false;
-
- MissileLocal missile = getInstanceByType(MissileLocal.class);
- missile.fire();
-
- assert MissileInterceptor.intercepted;
- }
-}
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/Airborne.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/Airborne.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/Airborne.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.interceptorOrder;
+
+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.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.interceptor.InterceptorBinding;
+
+ at Target( { TYPE, METHOD})
+ at Retention(RUNTIME)
+ at Documented
+ at InterceptorBinding
+public @interface Airborne
+{
+
+}
\ No newline at end of file
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/Missile.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/Missile.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/Missile.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.interceptorOrder;
+
+import javax.ejb.Stateful;
+import javax.interceptor.Interceptors;
+
+ at Stateful
+ at Airborne
+ at Interceptors(RadarInterceptor.class)
+public class Missile implements MissileLocal
+{
+ public void fire() {}
+}
\ No newline at end of file
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/MissileInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/MissileInterceptor.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/MissileInterceptor.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.interceptorOrder;
+
+import java.io.Serializable;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+ at Interceptor @Airborne
+class MissileInterceptor implements Serializable
+{
+ public static boolean intercepted = false;
+
+ @AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception
+ {
+ intercepted = true;
+ return ctx.proceed();
+ }
+}
\ No newline at end of file
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/MissileLocal.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/MissileLocal.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/MissileLocal.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.interceptorOrder;
+
+import javax.ejb.Local;
+
+ at Local
+public interface MissileLocal
+{
+ void fire();
+}
\ No newline at end of file
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/RadarInterceptor.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/RadarInterceptor.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/RadarInterceptor.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright <Year>, Red Hat, Inc. and/or its affiliates, 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.interceptors.definition.enterprise.interceptorOrder;
+
+import java.io.Serializable;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+public class RadarInterceptor implements Serializable
+{
+ public static boolean intercepted = false;
+ public static boolean interceptedFirst = false;
+
+ @AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception
+ {
+ intercepted = true;
+ interceptedFirst = !MissileInterceptor.intercepted;
+ return ctx.proceed();
+ }
+}
\ No newline at end of file
Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/SessionBeanInterceptorOrderTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/SessionBeanInterceptorOrderTest.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/SessionBeanInterceptorOrderTest.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -0,0 +1,36 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.interceptorOrder;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+
+ at IntegrationTest
+ at Artifact
+ at Packaging(PackagingType.EAR)
+ at SpecVersion(spec="cdi", version="20091101")
+ at BeansXml("beans.xml")
+public class SessionBeanInterceptorOrderTest extends AbstractJSR299Test
+{
+ @Test(groups = "jboss-as-broken")
+ @SpecAssertion(section = "9.4", id = "fb")
+ public void testInterceptorsDeclaredUsingInterceptorsCalledBeforeInterceptorBinding()
+ {
+ MissileInterceptor.intercepted = false;
+ RadarInterceptor.intercepted = false;
+ RadarInterceptor.interceptedFirst = false;
+
+ MissileLocal missile = getInstanceByType(MissileLocal.class);
+ missile.fire();
+
+ assert MissileInterceptor.intercepted;
+ assert RadarInterceptor.intercepted;
+ assert RadarInterceptor.interceptedFirst;
+ }
+}
\ No newline at end of file
Copied: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/Airborne.java (from rev 4862, cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/Airborne.java)
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/Airborne.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/Airborne.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.simpleInterception;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+
+import javax.interceptor.InterceptorBinding;
+
+ at Target( { TYPE, METHOD})
+ at Retention(RUNTIME)
+ at Documented
+ at InterceptorBinding
+public @interface Airborne
+{
+
+}
\ No newline at end of file
Copied: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/Missile.java (from rev 4862, cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/Missile.java)
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/Missile.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/Missile.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.simpleInterception;
+
+import javax.ejb.Stateful;
+
+ at Stateful
+ at Airborne
+public class Missile implements MissileLocal
+{
+ public void fire() {}
+}
Copied: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/MissileInterceptor.java (from rev 4862, cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/MissileInterceptor.java)
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/MissileInterceptor.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/MissileInterceptor.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.simpleInterception;
+
+import java.io.Serializable;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+ at Interceptor @Airborne
+class MissileInterceptor implements Serializable
+{
+ public static boolean intercepted = false;
+
+ @AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception
+ {
+ intercepted = true;
+ return ctx.proceed();
+ }
+}
Copied: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/MissileLocal.java (from rev 4862, cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/MissileLocal.java)
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/MissileLocal.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/MissileLocal.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.simpleInterception;
+
+import javax.ejb.Local;
+
+ at Local
+public interface MissileLocal
+{
+ void fire();
+}
Copied: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/SessionBeanInterceptorDefinitionTest.java (from rev 4862, cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/SessionBeanInterceptorDefinitionTest.java)
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/SessionBeanInterceptorDefinitionTest.java (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/SessionBeanInterceptorDefinitionTest.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -0,0 +1,32 @@
+package org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.simpleInterception;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+
+ at IntegrationTest
+ at Artifact
+ at Packaging(PackagingType.EAR)
+ at SpecVersion(spec="cdi", version="20091101")
+ at BeansXml("beans.xml")
+public class SessionBeanInterceptorDefinitionTest extends AbstractJSR299Test
+{
+ @Test(groups = "jboss-as-broken")
+ @SpecAssertion(section = "7.2", id = "c")
+ public void testSessionBeanIsIntercepted()
+ {
+ MissileInterceptor.intercepted = false;
+
+ MissileLocal missile = getInstanceByType(MissileLocal.class);
+ missile.fire();
+
+ assert MissileInterceptor.intercepted;
+ }
+}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java 2009-11-10 03:07:46 UTC (rev 4931)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java 2009-11-10 03:14:14 UTC (rev 4932)
@@ -29,7 +29,7 @@
}
@Test
- @SpecAssertion(section = "9.4", id = "f")
+ @SpecAssertion(section = "9.4", id = "fa")
public void testInterceptorsDeclaredUsingInterceptorsCalledBeforeInterceptorBinding()
{
TransactionalInterceptor.first = false;
Deleted: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/beans.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/beans.xml 2009-11-10 03:07:46 UTC (rev 4931)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/beans.xml 2009-11-10 03:14:14 UTC (rev 4932)
@@ -1,5 +0,0 @@
-<beans>
- <interceptors>
- <class>org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.MissileInterceptor</class>
- </interceptors>
-</beans>
\ No newline at end of file
Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/beans.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/beans.xml (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/interceptorOrder/beans.xml 2009-11-10 03:14:14 UTC (rev 4932)
@@ -0,0 +1,5 @@
+<beans>
+ <interceptors>
+ <class>org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.interceptorOrder.MissileInterceptor</class>
+ </interceptors>
+</beans>
\ No newline at end of file
Copied: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/beans.xml (from rev 4862, cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/beans.xml)
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/beans.xml (rev 0)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/beans.xml 2009-11-10 03:14:14 UTC (rev 4932)
@@ -0,0 +1,5 @@
+<beans>
+ <interceptors>
+ <class>org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.simpleInterception.MissileInterceptor</class>
+ </interceptors>
+</beans>
\ No newline at end of file
Modified: cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-11-10 03:07:46 UTC (rev 4931)
+++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-11-10 03:14:14 UTC (rev 4932)
@@ -4610,10 +4610,20 @@
<text>If the same class is listed twice under the |<interceptors>| element, the container automatically detects the problem and treats it as a deployment problem.</text>
</assertion>
- <assertion id="f">
- <text>Interceptors declared using |@Interceptors| or in |ejb-jar.xml| are called before interceptors declared using interceptor bindings.</text>
- </assertion>
+ <group>
+ <text>Interceptors declared using |@Interceptors| or in |ejb-jar.xml| are called before interceptors declared
+ using interceptor bindings.
+ </text>
+ <assertion id="fa">
+ <text>Test with a managed bean</text>
+ </assertion>
+
+ <assertion id="fb">
+ <text>Test with session bean</text>
+ </assertion>
+ </group>
+
<assertion id="g">
<text>Interceptors are called before decorators.</text>
</assertion>
More information about the weld-commits
mailing list