[webbeans-commits] Webbeans SVN: r3567 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml and 7 other directories.

Author: shane.bryzak(a)jboss.com Date: 2009-08-20 02:46:05 -0400 (Thu, 20 Aug 2009) New Revision: 3567 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/Foo.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/FordInterceptor.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/beans.xml Modified: tck/trunk/impl/src/main/resources/tck-audit-cdi.xml Log: more section 9 interceptor tests Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/NonExistantClassInBeansXmlTest.java 2009-08-20 06:46:05 UTC (rev 3567) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonExistantClassInBeansXml; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DeploymentError; +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.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DeploymentError.class) +@SpecVersion(spec = "cdi", version="1.0.20090625") +(a)BeansXml(&quot;beans.xml&quot;) +public class NonExistantClassInBeansXmlTest extends AbstractJSR299Test +{ + @Test + @SpecAssertion(section = "9.4", id = "caa") + public void testNonExistantClassInBeansXmlNotOk() + { + assert false; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/Foo.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/Foo.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/Foo.java 2009-08-20 06:46:05 UTC (rev 3567) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonInterceptorClassInBeansXml; + +class Foo +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/NonInterceptorClassInBeansXmlTest.java 2009-08-20 06:46:05 UTC (rev 3567) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonInterceptorClassInBeansXml; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DeploymentError; +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.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DeploymentError.class) +@SpecVersion(spec = "cdi", version="1.0.20090625") +(a)BeansXml(&quot;beans.xml&quot;) +public class NonInterceptorClassInBeansXmlTest extends AbstractJSR299Test +{ + @Test(groups = "ri-broken") + @SpecAssertion(section = "9.4", id = "cab") + public void testNonInterceptorClassInBeansXmlNotOk() + { + assert false; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/FordInterceptor.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/FordInterceptor.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/FordInterceptor.java 2009-08-20 06:46:05 UTC (rev 3567) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.interceptors.definition.broken.sameClassListedTwiceInBeansXml; + +import javax.interceptor.AroundInvoke; +import javax.interceptor.InvocationContext; + +class FordInterceptor +{ + @AroundInvoke public Object alwaysReturnThis(InvocationContext ctx) throws Exception + { + return ctx.proceed(); + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/SameClassListedTwiceInBeansXmlTest.java 2009-08-20 06:46:05 UTC (rev 3567) @@ -0,0 +1,24 @@ +package org.jboss.jsr299.tck.tests.interceptors.definition.broken.sameClassListedTwiceInBeansXml; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.jsr299.tck.DeploymentError; +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.ExpectedDeploymentException; +import org.jboss.testharness.impl.packaging.jsr299.BeansXml; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(DeploymentError.class) +@SpecVersion(spec = "cdi", version="1.0.20090625") +(a)BeansXml(&quot;beans.xml&quot;) +public class SameClassListedTwiceInBeansXmlTest extends AbstractJSR299Test +{ + @Test(groups = "ri-broken") + @SpecAssertion(section = "9.4", id = "cb") + public void testSameInterceptorClassListedTwiceInBeansXmlNotOk() + { + assert false; + } +} Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonExistantClassInBeansXml/beans.xml 2009-08-20 06:46:05 UTC (rev 3567) @@ -0,0 +1,5 @@ +<beans> + <interceptors> + <class>com.acme.Foo</class> + </interceptors> +</beans> Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/nonInterceptorClassInBeansXml/beans.xml 2009-08-20 06:46:05 UTC (rev 3567) @@ -0,0 +1,5 @@ +<beans> + <interceptors> + <class>org.jboss.jsr299.tck.tests.interceptors.definition.broken.nonInterceptorClassInBeansXml.Foo</class> + </interceptors> +</beans> Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/broken/sameClassListedTwiceInBeansXml/beans.xml 2009-08-20 06:46:05 UTC (rev 3567) @@ -0,0 +1,6 @@ +<beans> + <interceptors> + <class>org.jboss.jsr299.tck.tests.interceptors.definition.broken.sameClassListedTwiceInBeansXml.FordInterceptor</class> + <class>org.jboss.jsr299.tck.tests.interceptors.definition.broken.sameClassListedTwiceInBeansXml.FordInterceptor</class> + </interceptors> +</beans> Modified: tck/trunk/impl/src/main/resources/tck-audit-cdi.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-08-20 04:06:38 UTC (rev 3566) +++ tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-08-20 06:46:05 UTC (rev 3567) @@ -3987,10 +3987,18 @@ <text>The order of the interceptor declarations determines the interceptor ordering. Interceptors which occur earlier in the list are called first.</text> </assertion> - - <assertion id="ca"> - <text>Each child |&lt;class&gt;| element must specify the name of an interceptor class. If there is no class with the specified name, or if the class with the specified name is not an interceptor class, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text> - </assertion> + + <group> + <text>Each child |&lt;class&gt;| element must specify the name of an interceptor class. If there is no class with the specified name, or if the class with the specified name is not an interceptor class, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text> + + <assertion id="caa"> + <text>Test with a non-existant class.</text> + </assertion> + + <assertion id="cab"> + <text>Test with a class that isn't an interceptor.</text> + </assertion> + </group> <assertion id="cb"> <text>If the same class is listed twice under the |&lt;interceptors&gt;| element, the container automatically detects the problem and treats it as a deployment problem, as defined in Section 12.4, "Problems detected automatically by the container".</text>