[jboss-cvs] JBossAS SVN: r77321 - in projects/aop/trunk/aop/src: resources/test and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 21 11:11:32 EDT 2008
Author: flavia.rainone at jboss.com
Date: 2008-08-21 11:11:32 -0400 (Thu, 21 Aug 2008)
New Revision: 77321
Added:
projects/aop/trunk/aop/src/resources/test/dynamicinvoke/
projects/aop/trunk/aop/src/resources/test/dynamicinvoke/jboss-aop.xml
projects/aop/trunk/aop/src/test/org/jboss/test/aop/dynamicinvoke/
projects/aop/trunk/aop/src/test/org/jboss/test/aop/dynamicinvoke/DynamicInvokeTestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/dynamicinvoke/MyInterceptor.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/dynamicinvoke/POJO.java
Modified:
projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java
Log:
[JBAOP-626] Added a lazy creation of metod infos on Advisor.dynamicInvoke method. Created the dynamicinvoke tests
to assert it is working equally on classic and on genadvisor mode.
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java 2008-08-21 14:09:28 UTC (rev 77320)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Advisor.java 2008-08-21 15:11:32 UTC (rev 77321)
@@ -1563,6 +1563,13 @@
MethodInvocation methodInvocation = (MethodInvocation) invocation;
long hash = methodInvocation.getMethodHash();
MethodInfo info = methodInfos.getMethodInfo(hash);
+ // this method may be unadvised. In this case, just create an info
+ // to use as parameter of MethodInvocation
+ if (info == null)
+ {
+ info = new MethodInfo(clazz, hash, hash, this);
+ methodInfos.put(hash, info);
+ }
aspects = info.getInterceptors();
if (aspects == null) aspects = new Interceptor[0];
if (target != null && target instanceof Advised)
Added: projects/aop/trunk/aop/src/resources/test/dynamicinvoke/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/dynamicinvoke/jboss-aop.xml (rev 0)
+++ projects/aop/trunk/aop/src/resources/test/dynamicinvoke/jboss-aop.xml 2008-08-21 15:11:32 UTC (rev 77321)
@@ -0,0 +1,7 @@
+<aop>
+ <interceptor name="MyInterceptor" class="org.jboss.test.aop.dynamicinvoke.MyInterceptor"/>
+
+ <bind pointcut="execution(void org.jboss.test.aop.dynamicinvoke.POJO->advised())">
+ <interceptor-ref name="MyInterceptor"/>
+ </bind>
+</aop>
\ No newline at end of file
Added: projects/aop/trunk/aop/src/test/org/jboss/test/aop/dynamicinvoke/DynamicInvokeTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/dynamicinvoke/DynamicInvokeTestCase.java (rev 0)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/dynamicinvoke/DynamicInvokeTestCase.java 2008-08-21 15:11:32 UTC (rev 77321)
@@ -0,0 +1,84 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.aop.dynamicinvoke;
+
+import java.lang.reflect.Method;
+
+import org.jboss.aop.Advised;
+import org.jboss.aop.Advisor;
+import org.jboss.aop.joinpoint.MethodInvocation;
+import org.jboss.aop.util.MethodHashing;
+import org.jboss.test.aop.AOPTestWithSetup;
+
+/**
+ * Tests {@link Advisor#dynamicInvoke(Object, org.jboss.aop.joinpoint.Invocation)}
+ * method.
+ *
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
+ */
+public class DynamicInvokeTestCase extends AOPTestWithSetup
+{
+ Advisor advisor;
+ POJO pojo;
+
+ public DynamicInvokeTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ this.pojo = new POJO();
+ this.advisor = ((Advised) pojo)._getAdvisor();
+ // check prerequisites
+ pojo.advised();
+ assertTrue(MyInterceptor.isInvoked());
+ MyInterceptor.clearHistory();
+ pojo.unadvised();
+ assertFalse(MyInterceptor.isInvoked());
+ MyInterceptor.clearHistory();
+ }
+
+ public void testDynamicInvokeAdvisedMethod() throws Throwable
+ {
+ invokeMethodDynamically("advised", true);
+ }
+
+ public void testDynamicInvokeUnadvisedMethod() throws Throwable
+ {
+ invokeMethodDynamically("unadvised", false);
+ }
+
+ public void invokeMethodDynamically(String methodName, boolean intercepted) throws Throwable
+ {
+ Method method = POJO.class.getDeclaredMethod(methodName);
+ long hash = MethodHashing.calculateHash(method);
+
+ MethodInvocation methodInvocation = new MethodInvocation(null, hash,
+ method, null, advisor);
+ advisor.dynamicInvoke(pojo, methodInvocation);
+
+ assertSame(intercepted, MyInterceptor.isInvoked());
+ assertEquals(methodName, POJO.getLastRun());
+ }
+}
\ No newline at end of file
Added: projects/aop/trunk/aop/src/test/org/jboss/test/aop/dynamicinvoke/MyInterceptor.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/dynamicinvoke/MyInterceptor.java (rev 0)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/dynamicinvoke/MyInterceptor.java 2008-08-21 15:11:32 UTC (rev 77321)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.aop.dynamicinvoke;
+
+import org.jboss.aop.advice.Interceptor;
+import org.jboss.aop.joinpoint.Invocation;
+
+/**
+ * Interceptor for dynamic invoke test.
+ *
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
+ */
+public class MyInterceptor implements Interceptor
+{
+ private static boolean invoked = false;
+
+ public static final boolean isInvoked()
+ {
+ return invoked;
+ }
+
+ public static final void clearHistory()
+ {
+ invoked = false;
+ }
+
+ public String getName()
+ {
+ return "MyInterceptor";
+ }
+
+ public Object invoke(Invocation invocation) throws Throwable
+ {
+ invoked = true;
+ return invocation.invokeNext();
+ }
+}
\ No newline at end of file
Added: projects/aop/trunk/aop/src/test/org/jboss/test/aop/dynamicinvoke/POJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/dynamicinvoke/POJO.java (rev 0)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/dynamicinvoke/POJO.java 2008-08-21 15:11:32 UTC (rev 77321)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.aop.dynamicinvoke;
+
+/**
+ * Pojo classe for dynamic invoke test.
+ *
+ * @author <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
+ */
+public class POJO
+{
+ private static String lastRun = null;
+
+ public static String getLastRun()
+ {
+ return lastRun;
+ }
+
+
+ public static void clearHistory()
+ {
+ lastRun = null;
+ }
+
+ public void advised()
+ {
+ lastRun = "advised";
+ }
+
+ public void unadvised()
+ {
+ lastRun = "unadvised";
+ }
+}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list