[webbeans-commits] Webbeans SVN: r3574 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings and 3 other directories.

[webbeans-commits at lists.jboss.org]

Author: shane.bryzak at jboss.com
Date: 2009-08-20 21:56:14 -0400 (Thu, 20 Aug 2009)
New Revision: 3574

Added:
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/beans.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/beans.xml
Modified:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java
Log:
assertion mappings, add missing beans.xml files to enable interceptors


Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java	2009-08-21 01:46:33 UTC (rev 3573)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorOrder/InterceptorOrderTest.java	2009-08-21 01:56:14 UTC (rev 3574)
@@ -2,6 +2,7 @@
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
@@ -13,7 +14,10 @@
 public class InterceptorOrderTest extends AbstractJSR299Test
 {
    @Test(groups = "ri-broken")
-   @SpecAssertion(section = "9.4", id = "b")
+   @SpecAssertions({
+      @SpecAssertion(section = "9.4", id = "b"),
+      @SpecAssertion(section = "9.5", id = "ea")
+   })
    public void testInterceptorOrder()
    {
       FirstInterceptor.calledFirst = false;

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java	2009-08-21 01:46:33 UTC (rev 3573)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java	2009-08-21 01:56:14 UTC (rev 3574)
@@ -4,16 +4,22 @@
 
 import org.jboss.jsr299.tck.AbstractJSR299Test;
 import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
 import org.jboss.test.audit.annotations.SpecVersion;
 import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
 import org.testng.annotations.Test;
 
 @Artifact
 @SpecVersion(spec="cdi", version="1.0.20090625")
+ at BeansXml("beans.xml")
 public class MultipleInterceptorBindingsTest extends AbstractJSR299Test
 {
    @Test(groups = "ri-broken")
-   @SpecAssertion(section = "9.5.1", id = "a")
+   @SpecAssertions({
+      @SpecAssertion(section = "9.5.1", id = "a"),
+      @SpecAssertion(section = "9.5", id = "ca")
+   })
    public void testInterceptorAppliedToBeanWithAllBindings()
    {
       MissileInterceptor.intercepted = false;

Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/beans.xml	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/beans.xml	2009-08-21 01:56:14 UTC (rev 3574)
@@ -0,0 +1,5 @@
+<beans> 
+  <interceptors>
+    <class>org.jboss.jsr299.tck.tests.interceptors.definition.interceptorCalledBeforeDecorator.TransactionInterceptor</class>      
+  </interceptors>
+</beans>

Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/beans.xml	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/beans.xml	2009-08-21 01:56:14 UTC (rev 3574)
@@ -0,0 +1,5 @@
+<beans> 
+  <interceptors>
+    <class>org.jboss.jsr299.tck.tests.interceptors.definition.multipleBindings.MissileInterceptor</class>      
+  </interceptors>
+</beans>