Author: marius.bogoevici Date: 2009-11-19 12:51:13 -0500 (Thu, 19 Nov 2009) New Revision: 5102 Modified: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/AggregatingInterceptor.java extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java Log: Fixed interceptor definitions: method signatures were not compliant with the specification, aggregating interceptor had wrong annotation. Enabled tests. Modified: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java =================================================================== --- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java 2009-11-19 07:55:43 UTC (rev 5101) +++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java 2009-11-19 17:51:13 UTC (rev 5102) @@ -57,15 +57,14 @@ intTestBean.doSomethingRecorded(); System.out.println(RecordingInterceptor.methodsRecorded); System.out.println(AggregatingInterceptor.methodsCalled); -// FIXME: This fails -// Assert.assertTrue(RecordingInterceptor.methodsRecorded.contains("doSomethingRecorded")); + Assert.assertTrue(RecordingInterceptor.methodsRecorded.contains("doSomethingRecorded")); intTestBean.doSomethingRecordedAndAggregated(); System.out.println(RecordingInterceptor.methodsRecorded); System.out.println(AggregatingInterceptor.methodsCalled); -// FIXME: This fails -// Assert.assertEquals(1, AggregatingInterceptor.methodsCalled); + Assert.assertEquals(1, AggregatingInterceptor.methodsCalled); + shutdownManager(manager); } Modified: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/AggregatingInterceptor.java =================================================================== --- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/AggregatingInterceptor.java 2009-11-19 07:55:43 UTC (rev 5101) +++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/AggregatingInterceptor.java 2009-11-19 17:51:13 UTC (rev 5102) @@ -24,7 +24,7 @@ /** * @author Peter Royle */ -@Recorded @Interceptor +@Aggregated @Interceptor public class AggregatingInterceptor { public static int methodsCalled = 0; @@ -34,7 +34,8 @@ } @AroundInvoke - public void recordMEthodCall(InvocationContext ctx) { - methodsCalled ++; + public Object recordMEthodCall(InvocationContext ctx) throws Exception { + methodsCalled ++; + return ctx.proceed(); } } Modified: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java =================================================================== --- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java 2009-11-19 07:55:43 UTC (rev 5101) +++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java 2009-11-19 17:51:13 UTC (rev 5102) @@ -36,9 +36,10 @@ } @AroundInvoke - public void recordMethodCall(InvocationContext ctx) { + public Object recordMethodCall(InvocationContext ctx) throws Exception { final String methodName = ctx.getMethod().getName(); System.out.println("Recording method: " + methodName); methodsRecorded.add(methodName); + return ctx.proceed(); } }