[weld-commits] Weld SVN: r6853 - core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-07-29 16:29:08 -0400 (Thu, 29 Jul 2010)
New Revision: 6853

Modified:
   core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java
   core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java
   core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java
Log:
There was a blip in the matrix

Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java	2010-07-29 19:31:17 UTC (rev 6852)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/IncrementingInterceptor.java	2010-07-29 20:29:08 UTC (rev 6853)
@@ -16,6 +16,7 @@
  */
 package org.jboss.weld.tests.extensions.interceptors;
 
+import javax.interceptor.AroundInvoke;
 import javax.interceptor.InvocationContext;
 
 /**
@@ -28,7 +29,7 @@
 {
    private static boolean doAroundCalled = false;
 
-   // @AroundInvoke
+   @AroundInvoke
    public Object doAround(InvocationContext context) throws Exception
    {
       doAroundCalled = true;

Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java	2010-07-29 19:31:17 UTC (rev 6852)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/InterceptorExtensionTest.java	2010-07-29 20:29:08 UTC (rev 6853)
@@ -28,7 +28,6 @@
 import org.jboss.shrinkwrap.api.BeanArchive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.weld.test.Utils;
 import org.jboss.weld.tests.category.Integration;
 import org.jboss.weld.tests.util.annotated.TestAnnotatedTypeBuilder;
 import org.junit.Assert;
@@ -65,7 +64,7 @@
    @Test
    public void testInterceptorCalled(NumberSource ng)
    {
-      Assert.assertEquals(1, ng.value());
+      Assert.assertEquals(2, ng.value());
       Assert.assertTrue(IncrementingInterceptor.isDoAroundCalled());
    }
 
@@ -78,7 +77,7 @@
       Marathon m = (Marathon)bean.create(creationalContext);
       
       Assert.assertTrue(LifecycleInterceptor.isPostConstructCalled());
-      Assert.assertEquals(24, m.getLength());
+      Assert.assertEquals(42, m.getLength());
       bean.destroy(m, creationalContext);
       Assert.assertTrue(LifecycleInterceptor.isPreDestroyCalled());
    }

Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java
===================================================================
--- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java	2010-07-29 19:31:17 UTC (rev 6852)
+++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/extensions/interceptors/LifecycleInterceptor.java	2010-07-29 20:29:08 UTC (rev 6853)
@@ -16,6 +16,8 @@
  */
 package org.jboss.weld.tests.extensions.interceptors;
 
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import javax.interceptor.InvocationContext;
 
 /**
@@ -28,13 +30,13 @@
    static private boolean preDestroyCalled = false;
    static private boolean postConstructCalled = false;
 
-   // PreDestroy
+   @PreDestroy
    public void preDestroy(InvocationContext ctx)
    {
       preDestroyCalled = true;
    }
 
-   // @PostConstruct
+   @PostConstruct
    public void postConstruct(InvocationContext ctx)
    {
       Object marathon = ctx.getTarget();