9:43 p.m.
Author: marius.bogoevici
Date: 2009-11-09 22:43:13 -0500 (Mon, 09 Nov 2009)
New Revision: 4933
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/Airborne.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/Cruiser.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/Missile.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/MissileInterceptor.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/MissileLocal.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/SessionBeanInterceptorOnNonContextualEjbReferenceTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/Ship.java
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/beans.xml
Modified:
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/tck-audit-cdi.xml
Log:
WELD-36 Adding assertion 7.2 h for validation @EJB-injected session beans. Enabling simple
session intercetion test 7.2 c.
Copied:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/Airborne.java
(from rev 4932,
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/nonContextualReference/Airborne.java
(rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/Airborne.java 2009-11-10
03:43:13 UTC (rev 4933)
@@ -0,0 +1,20 @@
+package
org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference;
+
+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;
+
+@Target( { TYPE, METHOD})
+@Retention(RUNTIME)
+@Documented
+@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/nonContextualReference/Cruiser.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/Cruiser.java
(rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/Cruiser.java 2009-11-10
03:43:13 UTC (rev 4933)
@@ -0,0 +1,15 @@
+package
org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference;
+
+import javax.ejb.EJB;
+
+public class Cruiser implements Ship
+{
+
+ @EJB
+ MissileLocal missile;
+
+ public void defend()
+ {
+ missile.fire();
+ }
+}
Copied:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/Missile.java
(from rev 4932,
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/nonContextualReference/Missile.java
(rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/Missile.java 2009-11-10
03:43:13 UTC (rev 4933)
@@ -0,0 +1,10 @@
+package
org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference;
+
+import javax.ejb.Stateful;
+
+@Stateful
+@Airborne
+public class Missile implements MissileLocal
+{
+ public void fire() {}
+}
\ No newline at end of file
Copied:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/MissileInterceptor.java
(from rev 4932,
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/nonContextualReference/MissileInterceptor.java
(rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/MissileInterceptor.java 2009-11-10
03:43:13 UTC (rev 4933)
@@ -0,0 +1,19 @@
+package
org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference;
+
+import java.io.Serializable;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@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
Copied:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/MissileLocal.java
(from rev 4932,
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/nonContextualReference/MissileLocal.java
(rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/MissileLocal.java 2009-11-10
03:43:13 UTC (rev 4933)
@@ -0,0 +1,9 @@
+package
org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference;
+
+import javax.ejb.Local;
+
+@Local
+public interface MissileLocal
+{
+ void fire();
+}
\ No newline at end of file
Copied:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/SessionBeanInterceptorOnNonContextualEjbReferenceTest.java
(from rev 4932,
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/SessionBeanInterceptorDefinitionTest.java)
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/SessionBeanInterceptorOnNonContextualEjbReferenceTest.java
(rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/SessionBeanInterceptorOnNonContextualEjbReferenceTest.java 2009-11-10
03:43:13 UTC (rev 4933)
@@ -0,0 +1,49 @@
+/*
+ * 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.nonContextualReference;
+
+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;
+
+
+@IntegrationTest
+@Artifact
+(a)Packaging(PackagingType.EAR)
+@SpecVersion(spec="cdi", version="20091101")
+(a)BeansXml("beans.xml")
+public class SessionBeanInterceptorOnNonContextualEjbReferenceTest extends
AbstractJSR299Test
+{
+ @Test
+ @SpecAssertion(section = "7.2", id = "h")
+ public void testNonContextualSessionBeanReferenceIsIntercepted()
+ {
+ MissileInterceptor.intercepted = false;
+
+ Ship cruiser = getInstanceByType(Ship.class);
+ cruiser.defend();
+
+ assert MissileInterceptor.intercepted;
+ }
+}
\ No newline at end of file
Added:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/Ship.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/Ship.java
(rev 0)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/Ship.java 2009-11-10
03:43:13 UTC (rev 4933)
@@ -0,0 +1,9 @@
+package
org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference;
+
+import javax.ejb.Local;
+
+@Local
+public interface Ship
+{
+ void defend();
+}
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/SessionBeanInterceptorDefinitionTest.java
===================================================================
---
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)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/simpleInterception/SessionBeanInterceptorDefinitionTest.java 2009-11-10
03:43:13 UTC (rev 4933)
@@ -18,7 +18,7 @@
@BeansXml("beans.xml")
public class SessionBeanInterceptorDefinitionTest extends AbstractJSR299Test
{
- @Test(groups = "jboss-as-broken")
+ @Test
@SpecAssertion(section = "7.2", id = "c")
public void testSessionBeanIsIntercepted()
{
Copied:
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/beans.xml
(from rev 4932,
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/nonContextualReference/beans.xml
(rev 0)
+++
cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/enterprise/nonContextualReference/beans.xml 2009-11-10
03:43:13 UTC (rev 4933)
@@ -0,0 +1,5 @@
+<beans>
+ <interceptors>
+
<class>org.jboss.jsr299.tck.tests.interceptors.definition.enterprise.nonContextualReference.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:14:14 UTC (rev
4932)
+++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-11-10 03:43:13 UTC (rev
4933)
@@ -4066,6 +4066,11 @@
<assertion id="g">
<text>If the invocation is not a business method invocation, it is treated as
a normal Java method call and is not intercepted by the container.</text>
</assertion>
+
+ <assertion id="h" implied="true">
+ <text>Verify that a non-contextual session bean reference is
intercepted</text>
+ </assertion>
+
</section>
<section id="7.3" title="Lifecycle of contextual instances">