[jboss-cvs] JBossAS SVN: r58893 - projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Dec 6 20:33:48 EST 2006
Author: flavia.rainone
Date: 2006-12-06 20:33:37 -0500 (Wed, 06 Dec 2006)
New Revision: 58893
Modified:
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/ArgsAspect.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/BeforeAfterThrowingTestCase.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/GeneralAspect.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/POJO.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/SimpleAspect.java
Log:
[JBAOP-37] Updated tests so they check whether advices are being called at the correct moment (before/after/around/throwing).
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/ArgsAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/ArgsAspect.java 2006-12-07 00:56:57 UTC (rev 58892)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/ArgsAspect.java 2006-12-07 01:33:37 UTC (rev 58893)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.aop.beforeafter;
+import junit.framework.Assert;
+
import org.jboss.aop.ConstructorInfo;
import org.jboss.aop.FieldInfo;
import org.jboss.aop.MethodInfo;
@@ -40,6 +42,7 @@
public static String before;
public static String after;
public static String throwing;
+ public static Throwable exception;
public static void clear()
@@ -47,53 +50,63 @@
before = null;
after = null;
throwing = null;
+ POJO.joinPointRun = false;
}
public void before(@Arg boolean b, @Arg int i)
{
before = "before1";
+ Assert.assertFalse(POJO.joinPointRun);
}
public void before(@JoinPoint MethodInfo mjp, @Arg int i)
{
before = "before2";
+ Assert.assertFalse(POJO.joinPointRun);
}
public void before(@JoinPoint FieldInfo fjp, @Arg int i)
{
before = "before3";
+ Assert.assertFalse(POJO.joinPointRun);
}
public void before(@JoinPoint FieldInfo fjp)
{
before = "before4";
+ Assert.assertFalse(POJO.joinPointRun);
}
public void before(@JoinPoint FieldInfo fjp, @Arg SubValue val)
{
before = "before5";
+ Assert.assertFalse(POJO.joinPointRun);
}
public void before(@Arg SubValue sup, @Arg SubValue sub)
{
before = "before6";
+ Assert.assertFalse(POJO.joinPointRun);
}
public void before(@Arg SuperValue sup, @Arg SubValue sub)
{
before = "before7";
+ Assert.assertFalse(POJO.joinPointRun);
}
public POJO after(@JoinPoint MethodInfo mjp, @Return POJO ret, @Arg int i,
@Arg long l)
{
after = "after1";
+ Assert.assertTrue(POJO.joinPointRun);
return ret;
}
public POJO after(@JoinPoint ConstructorInfo cjp, @Return POJO ret)
{
after = "after2";
+ Assert.assertTrue(POJO.joinPointRun);
return ret;
}
@@ -129,29 +142,34 @@
{
after = "after6";
ret.doubleValue();
+ Assert.assertTrue(POJO.joinPointRun);
return new SubValue(ret.getValue());
}
public void after(@Arg SuperValue sup, @Arg SuperValue sup2)
{
after = "after7";
+ Assert.assertTrue(POJO.joinPointRun);
}
public Throwable throwing(@Thrown Throwable t, @Arg int i)
{
throwing = "throwing1";
+ exception = t;
return t;
}
public Throwable throwing(@JoinPoint MethodInfo mjp, @Thrown Throwable t)
{
throwing = "throwing2";
+ exception = t;
return t;
}
public Throwable throwing(@JoinPoint MethodInfo mjp, @Thrown Throwable t, @Arg int i)
{
throwing = "throwing3";
+ exception = t;
return t;
}
}
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/BeforeAfterThrowingTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/BeforeAfterThrowingTestCase.java 2006-12-07 00:56:57 UTC (rev 58892)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/BeforeAfterThrowingTestCase.java 2006-12-07 01:33:37 UTC (rev 58893)
@@ -59,7 +59,7 @@
}
catch(TestException e)
{
-
+ assertSame(e, SimpleAspect.exception);
}
assertTrue(SimpleAspect.before);
@@ -86,6 +86,7 @@
assertEquals("before1", ArgsAspect.before);
assertNull(ArgsAspect.after);
assertEquals("throwing1", ArgsAspect.throwing);
+ assertSame(e, ArgsAspect.exception);
}
System.out.println("* Testing ctor(boolean, int, long, String)");
@@ -119,6 +120,8 @@
}
catch (TestException e)
{
+ assertSame(e, ArgsAspect.exception);
+ assertSame(e, SimpleAspect.exception);
}
assertNull(ArgsAspect.before);
assertNull(ArgsAspect.after);
@@ -151,6 +154,7 @@
}
catch (TestException e)
{
+ assertSame(e, ArgsAspect.exception);
}
System.out.println("* Testing method(boolean, int, long, String)");
@@ -167,6 +171,7 @@
}
catch (TestException e)
{
+ assertSame(e, ArgsAspect.exception);
}
assertEquals("before2", ArgsAspect.before);
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/GeneralAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/GeneralAspect.java 2006-12-07 00:56:57 UTC (rev 58892)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/GeneralAspect.java 2006-12-07 01:33:37 UTC (rev 58893)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.aop.beforeafter;
+import junit.framework.Assert;
+
import org.jboss.aop.JoinPointInfo;
import org.jboss.aop.advice.annotation.Arg;
import org.jboss.aop.advice.annotation.JoinPoint;
@@ -40,18 +42,21 @@
{
before = null;
after = null;
+ POJO.joinPointRun = false;
}
public void before(@JoinPoint JoinPointInfo jp, @Arg SuperValue superValue, @Arg int i)
{
before = "before";
+ Assert.assertFalse(POJO.joinPointRun);
}
public Object after(@JoinPoint JoinPointInfo jp, @Return Object ret,
@Arg SuperValue superValue, @Arg int i)
{
after = "after";
+ Assert.assertTrue(POJO.joinPointRun);
return ret;
}
}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/POJO.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/POJO.java 2006-12-07 00:56:57 UTC (rev 58892)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/POJO.java 2006-12-07 01:33:37 UTC (rev 58893)
@@ -28,6 +28,7 @@
*/
public class POJO
{
+ static boolean joinPointRun = false;
int i;
SubValue subValue;
@@ -35,21 +36,23 @@
public POJO()
{
-
+ joinPointRun = true;
}
public POJO(boolean error, int i, long l, String s) throws TestException
{
+ joinPointRun = true;
if (error) throw new TestException();
}
public POJO(SuperValue superValue, int i)
{
-
+ joinPointRun = true;
}
public int method(boolean error)throws TestException
{
+ joinPointRun = true;
if (error) throw new TestException();
return 1;
@@ -57,6 +60,7 @@
public int method(boolean error, int i, long l, String s) throws TestException
{
+ joinPointRun = true;
if (error) throw new TestException();
return i;
@@ -64,6 +68,7 @@
public POJO method(boolean error, int i, long l, String s, int i2) throws TestException
{
+ joinPointRun = true;
if (error) throw new TestException();
return this;
@@ -71,26 +76,29 @@
public void method()
{
-
+ joinPointRun = true;
}
public SuperValue method(SubValue sup, SubValue sub)
{
+ joinPointRun = true;
return sub;
}
public void method(SuperValue sup, SubValue sub)
{
-
+ joinPointRun = true;
}
public SubValue method(SubValue subValue, int i)
{
+ joinPointRun = true;
return subValue;
}
public SuperValue method(SuperValue superValue, int i)
{
+ joinPointRun = true;
return superValue;
}
-}
+}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/SimpleAspect.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/SimpleAspect.java 2006-12-07 00:56:57 UTC (rev 58892)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafter/SimpleAspect.java 2006-12-07 01:33:37 UTC (rev 58893)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.aop.beforeafter;
+import junit.framework.Assert;
+
import org.jboss.aop.advice.annotation.Return;
import org.jboss.aop.advice.annotation.Thrown;
import org.jboss.aop.joinpoint.Invocation;
@@ -36,6 +38,7 @@
public static boolean around;
public static boolean after;
public static boolean throwing;
+ public static Throwable exception;
public static void clear()
{
@@ -43,19 +46,24 @@
around = false;
after = false;
throwing = false;
+ POJO.joinPointRun = false;
}
public void before()
{
System.out.println("SimpleAspect.before");
before = true;
+ Assert.assertFalse(POJO.joinPointRun);
}
public Object around(Invocation invocation) throws Throwable
{
System.out.println("SimpleAspect.around");
around = true;
- return invocation.invokeNext();
+ Assert.assertFalse(POJO.joinPointRun);
+ Object result = invocation.invokeNext();
+ Assert.assertTrue(POJO.joinPointRun);
+ return result;
}
//Do we have to return the same exception as the target joinpoint?
@@ -63,13 +71,14 @@
{
System.out.println("SimpleAspect.after");
after = true;
+ Assert.assertTrue(POJO.joinPointRun);
return i;
}
public void throwing(@Thrown Throwable t)
{
System.out.println("SimpleAspect.throwing");
+ exception = t;
throwing = true;
}
-
-}
+}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list