[weld-commits] Weld SVN: r4769 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext.

[weld-commits at lists.jboss.org]

Author: jharting
Date: 2009-11-08 03:40:05 -0500 (Sun, 08 Nov 2009)
New Revision: 4769

Added:
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/Interceptor10.java
Modified:
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/InvocationContextTest.java
   cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/SimpleBean.java
Log:
Test for 6 n)

Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/Interceptor10.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/Interceptor10.java	                        (rev 0)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/Interceptor10.java	2009-11-08 08:40:05 UTC (rev 4769)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.interceptors.tests.invocationContext;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+class Interceptor10
+{
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception {
+      return ctx.getParameters()[0];
+   }
+}

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/InvocationContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/InvocationContextTest.java	2009-11-08 08:33:47 UTC (rev 4768)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/InvocationContextTest.java	2009-11-08 08:40:05 UTC (rev 4769)
@@ -104,4 +104,12 @@
       assert Interceptor8.isContextDataOK();
       assert Interceptor9.isContextDataOK();
    }
+   
+   @Test
+   @SpecAssertion(section = "6", id = "n")
+   public void testBusinessMethodNotCalledWithoutProceedInvocation()
+   {
+      assert getInstanceByType(SimpleBean.class).echo("foo").equals("foo");
+      assert !SimpleBean.isEchoCalled();
+   }
 }

Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/SimpleBean.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/SimpleBean.java	2009-11-08 08:33:47 UTC (rev 4768)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/invocationContext/SimpleBean.java	2009-11-08 08:40:05 UTC (rev 4769)
@@ -5,6 +5,7 @@
 class SimpleBean
 {
    private int id = 0;
+   private static boolean echoCalled = false;
 
    @Interceptors(Interceptor1.class)
    public int getId()
@@ -56,4 +57,15 @@
    public void foo()
    {
    }
+   
+   @Interceptors(Interceptor10.class)
+   public String echo(String s) {
+      echoCalled = true;
+      return s;
+   }
+
+   public static boolean isEchoCalled()
+   {
+      return echoCalled;
+   }
 }