test for if @style - a todo for Adrian

2 files changed, 18 insertions, 24 deletions

diff --git a/tests/java5/ataspectj/ataspectj/AllLTWTests.java b/tests/java5/ataspectj/ataspectj/AllLTWTests.java
index da5856674..db9f5d95c 100644
--- a/tests/java5/ataspectj/ataspectj/AllLTWTests.java
+++ b/tests/java5/ataspectj/ataspectj/AllLTWTests.java
@@ -22,17 +22,15 @@ public class AllLTWTests extends TestCase {
     public static Test suite() {
         TestSuite suite = new TestSuite("All tests");
 
-        suite.addTestSuite(ataspectj.SingletonAspectBindingsTest.class);
-        suite.addTestSuite(ataspectj.CflowTest.class);
-        suite.addTestSuite(ataspectj.PointcutReferenceTest.class);
-        suite.addTestSuite(ataspectj.AfterXTest.class);
-        //FIXME AV - fix the pc grammar to support if for @AJ aspects
-        System.err.println("(AllTests: IfPointcutTest fails)");
-        //suite.addTestSuite(IfPointcutTest.class);
-        suite.addTestSuite(ataspectj.XXJoinPointTest.class);
-        suite.addTestSuite(ataspectj.PrecedenceTest.class);
-        suite.addTestSuite(ataspectj.BindingTest.class);
-        suite.addTestSuite(ataspectj.PerClauseTest.class);
+        suite.addTestSuite(SingletonAspectBindingsTest.class);
+        suite.addTestSuite(CflowTest.class);
+        suite.addTestSuite(PointcutReferenceTest.class);
+        suite.addTestSuite(AfterXTest.class);
+        suite.addTestSuite(IfPointcutTest.class);
+        suite.addTestSuite(XXJoinPointTest.class);
+        suite.addTestSuite(PrecedenceTest.class);
+        suite.addTestSuite(BindingTest.class);
+        suite.addTestSuite(PerClauseTest.class);
         suite.addTestSuite(AroundInlineMungerTest.class);
         suite.addTestSuite(SingletonInheritanceTest.class);
         suite.addTestSuite(PerClauseInheritanceTest.class);
diff --git a/tests/java5/ataspectj/ataspectj/IfPointcutTest.java b/tests/java5/ataspectj/ataspectj/IfPointcutTest.java
index a50f59354..f793ceb59 100644
--- a/tests/java5/ataspectj/ataspectj/IfPointcutTest.java
+++ b/tests/java5/ataspectj/ataspectj/IfPointcutTest.java
@@ -34,10 +34,12 @@ public class IfPointcutTest extends TestCase {
     }
 
     public void testIf() {
-        fail("FIXME AV: see below, TestAspect has its advice and pointcut commented out");
+        s_log = new StringBuffer();
         IfPointcutTest me = new IfPointcutTest();
         me.hello(1);
+        assertEquals("aop ", s_log.toString());
         me.hello(-1);
+        assertEquals("aop ", s_log.toString());//unchanged
     }
 
     public static void main(String[] args) {
@@ -48,23 +50,17 @@ public class IfPointcutTest extends TestCase {
         return new junit.framework.TestSuite(IfPointcutTest.class);
     }
 
-
-
     @Aspect
     public static class TestAspect {
 
-        public boolean positive(int i) {
-            return (i>=0);
+        @Pointcut("args(i) && if()")
+        public static boolean positive(int i) {
+            return i>=0;
         }
 
-        //FIXME av if pcd support
-        //@Pointcut("args(i) && if(i>0)")
-        void ifPc(int i) {}
-
-        //FIXME av if pcd support
-        //@Before("execution(* ataspectj.IfPointcutTest.hello(int)) && ifPc(i)")
-        void before(int i) {
-            System.out.println("IfPointcutTest$TestAspect.before");
+        @Before("execution(* ataspectj.IfPointcutTest.hello(int)) && positive(i)")
+        public void before(int i) {
+            log("aop");
         }
     }
 }