[weld-commits] Weld SVN: r4023 - in cdi-tck/trunk/impl/src/main: resources/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator and 1 other directory.

[weld-commits at lists.jboss.org]

Author: marius.bogoevici
Date: 2009-10-13 19:26:59 -0400 (Tue, 13 Oct 2009)
New Revision: 4023

Modified:
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java
   cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/beans.xml
Log:
Fix test and enable.

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java	2009-10-13 20:56:13 UTC (rev 4022)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/InterceptorCalledBeforeDecoratorTest.java	2009-10-13 23:26:59 UTC (rev 4023)
@@ -4,13 +4,16 @@
 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.jsr299.BeansXml;
+
 import org.testng.annotations.Test;
 
 @Artifact
 @SpecVersion(spec="cdi", version="PFD2")
+ at BeansXml("beans.xml")
 public class InterceptorCalledBeforeDecoratorTest extends AbstractJSR299Test
 {
-   @Test(groups = "ri-broken")
+   @Test
    @SpecAssertion(section = "9.4", id = "g")
    public void testInterceptorCalledBeforeDecorator()
    {
@@ -21,5 +24,6 @@
       foo.bar();
       
       assert Foo.interceptorCalledFirst;
+      assert !Foo.decoratorCalledFirst;
    }
 }

Modified: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/beans.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/beans.xml	2009-10-13 20:56:13 UTC (rev 4022)
+++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/interceptors/definition/interceptorCalledBeforeDecorator/beans.xml	2009-10-13 23:26:59 UTC (rev 4023)
@@ -2,4 +2,7 @@
   <interceptors>
     <class>org.jboss.jsr299.tck.tests.interceptors.definition.interceptorCalledBeforeDecorator.TransactionInterceptor</class>      
   </interceptors>
+  <decorators>
+    <class>org.jboss.jsr299.tck.tests.interceptors.definition.interceptorCalledBeforeDecorator.FooDecorator</class>
+  </decorators>
 </beans>