test and fix for 148537

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
index 314bc9558200d069d00dcd9a55b569c5cd123b86..aa828c1c97c3cb43878ef0de6274f75789197490 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip and b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip differ

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
index 7b136a1e917d39dcfe504921988039b029d18098..75d3c01c30777dbe486d80f7769ed87bde858fa3 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar and b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar differ

diff --git a/tests/bugs153/pr148537/MyClass.java b/tests/bugs153/pr148537/MyClass.java
index ef6eed9a50b548e66d23bf2c7a132191a117d68f..ee449254c061bd4fd638de05bd4a84d2bfa0b668 100644 (file)
--- a/tests/bugs153/pr148537/MyClass.java
+++ b/tests/bugs153/pr148537/MyClass.java
@@ -2,7 +2,7 @@ import java.lang.annotation.*;
 
 public class MyClass {
 
-        @Retention({RententionPolicy.RUNTIME})
+        @Retention({RetentionPolicy.RUNTIME})
         private @interface MyAnnotation {
         }
 }

diff --git a/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java b/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java
index 574a598dca958477fef8c1228812a461536674c7..8e09602c43c78639e2e5d71489abf5f00a31560d 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc153/Ajc153Tests.java
@@ -29,7 +29,7 @@ public class Ajc153Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
        runTest("verification problem");   // build the code
        Utils.verifyClass(ajc,"mypackage.MyAspect"); // verify it <<< BRAND NEW VERIFY UTILITY FOR EVERYONE TO TRY ;)
   }
- // public void testIncorrectAnnotationValue_pr148537() { runTest("incorrect annotation value");}
+  public void testIncorrectAnnotationValue_pr148537() { runTest("incorrect annotation value");}
 
   
   /////////////////////////////////////////

diff --git a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
index 3d90e619497f67a9bbb93dabe573bfaa6876f2f9..4bc76dd65ad4a5bb6c547831ba5450cf60497fa6 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
+++ b/tests/src/org/aspectj/systemtest/ajc153/ajc153.xml
@@ -43,7 +43,9 @@
     </ajc-test>
     
     <ajc-test dir="bugs153/pr148537" title="incorrect annotation value">
-               <compile files="MyClass.java" options="-1.5"/>
+               <compile files="MyClass.java" options="-1.5">
+                 <message kind="error" line="5" text="Type mismatch: cannot convert from RetentionPolicy[] to RetentionPolicy"/>
+               </compile>
     </ajc-test>