commented jar target from bcel-builder/build.xml since broken (can someone comment ?)

impl @Aspect("issingleton")
fixed error reporting on readPerClause from @AJ

3 files changed, 12 insertions, 11 deletions

diff --git a/tests/java5/ataspectj/ataspectj/IfPointcutTest.java b/tests/java5/ataspectj/ataspectj/IfPointcutTest.java
index 66693ec4a..1073a730b 100644
--- a/tests/java5/ataspectj/ataspectj/IfPointcutTest.java
+++ b/tests/java5/ataspectj/ataspectj/IfPointcutTest.java
@@ -30,6 +30,7 @@ public class IfPointcutTest extends TestCase {
     }
 
     public void testIf() {
+        fail("FIXME AV: see below, TestAspect has its advice and pointcut commented out");
         IfPointcutTest me = new IfPointcutTest();
         me.hello(1);
         me.hello(-1);
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java
index c60ffb2ba..ecb517ab4 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjSyntaxTests.java
@@ -31,10 +31,9 @@ public class AtAjSyntaxTests extends XMLBasedAjcTestCase {
 	  return new File("../tests/src/org/aspectj/systemtest/ajc150/ataspectj/atajc150.xml");
 	}
 	
-// FIXME ATAJ Crashes because of specifying issingleton
-//    public void testSimpleBefore() {
-//        runTest("SimpleBefore");
-//    }
+    public void testSimpleBefore() {
+        runTest("SimpleBefore");
+    }
 	
     public void testSimpleAfter() {
         runTest("SimpleAfter");
@@ -65,12 +64,11 @@ public class AtAjSyntaxTests extends XMLBasedAjcTestCase {
 //        runTest("AfterXTest");
 //    }
 
-// FIXME alex @AJ impl + test
-// FIXME andy is this working or not Alex? It was commented out in the branch but uncommenting it - it
-//       runs fine for me.
-    public void testIfPointcut() {
-        runTest("IfPointcutTest");
-    }
+    //FIXME AV uncomment when IfPointcutTest.TestAspect can be compiled ie if() pcd can be parsed.
+    // right now the aspect is commented out.
+//    public void testIfPointcut() {
+//        runTest("IfPointcutTest");
+//    }
 
 // FIXME alex java.lang.VerifyError: (class: ataspectj/BindingTest, method: dup_aroundBody5$advice signature: (ILorg/aspectj/lang/JoinPoint;Lataspectj/BindingTest$TestAspect_1;ILorg/aspectj/lang/ProceedingJoinPoint;)Ljava/lang/Object;) Register 0 contains wrong type
 //    public void testBindings() {
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/atajc150-tests.xml b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/atajc150-tests.xml
index 39668594e..3a89a1290 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/atajc150-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/atajc150-tests.xml
@@ -1,7 +1,9 @@
 <!-- @AspectJ v1.5.0 Tests -->
 
     <ajc-test dir="java5/ataspectj" title="SimpleBefore">
-        <compile files="SimpleBefore.java" options="-1.5 -showWeaveInfo -XnoInline"/>
+        <compile files="SimpleBefore.java" options="-1.5 -showWeaveInfo -XnoInline">
+            <message kind="weave" text="(SimpleBefore.java:13) advised by before advice from 'SimpleBefore$X' (SimpleBefore.java:1)"/>
+        </compile>
         <run class="SimpleBefore"/>
     </ajc-test>