You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by co...@apache.org on 2013/02/15 17:16:53 UTC
svn commit: r1446671 - in /openwebbeans/branches/owb_1.0.x: ./ webbeans-impl/
webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/
webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/
Author: covener
Date: Fri Feb 15 16:16:52 2013
New Revision: 1446671
URL: http://svn.apache.org/r1446671
Log:
Merge r1446659 from trunk:
[OWB-771] enable dormant interceptor test, add @AroundInvoke to "aroundInvoke" method
in the test interceptor to get it to do actually do something.
Modified:
openwebbeans/branches/owb_1.0.x/ (props changed)
openwebbeans/branches/owb_1.0.x/webbeans-impl/ (props changed)
openwebbeans/branches/owb_1.0.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/DependentInterceptor.java
openwebbeans/branches/owb_1.0.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java
Propchange: openwebbeans/branches/owb_1.0.x/
------------------------------------------------------------------------------
svn:mergeinfo = /openwebbeans/branches/owb_1.1.x:1446659
Propchange: openwebbeans/branches/owb_1.0.x/webbeans-impl/
------------------------------------------------------------------------------
Merged /openwebbeans/branches/owb_1.1.x/webbeans-impl:r1446659
Modified: openwebbeans/branches/owb_1.0.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/DependentInterceptor.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.0.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/DependentInterceptor.java?rev=1446671&r1=1446670&r2=1446671&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.0.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/DependentInterceptor.java (original)
+++ openwebbeans/branches/owb_1.0.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/common/DependentInterceptor.java Fri Feb 15 16:16:52 2013
@@ -20,6 +20,7 @@ package org.apache.webbeans.newtests.int
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
+import javax.interceptor.AroundInvoke;
import org.apache.webbeans.newtests.interceptors.annotation.DependentInterceptorBindingType;
@@ -35,6 +36,7 @@ public class DependentInterceptor
refCount++;
}
+@AroundInvoke
public Object aroundInvoke(InvocationContext ctx) throws Exception
{
DEP_OK = true;
Modified: openwebbeans/branches/owb_1.0.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.0.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java?rev=1446671&r1=1446670&r2=1446671&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.0.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java (original)
+++ openwebbeans/branches/owb_1.0.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/interceptors/dependent/DependentInterceptorTest.java Fri Feb 15 16:16:52 2013
@@ -74,7 +74,7 @@ public class DependentInterceptorTest ex
DependentScopedBean dbean = (DependentScopedBean)reference;
dbean.sayHello();
- //X TODO this should finally work! Assert.assertTrue(DependentInterceptor.refCount == 1);
+ Assert.assertTrue(DependentInterceptor.refCount == 1);
Assert.assertTrue(DependentScopedBean.SAY_HELLO);