update aspectjrt.jar in lib and test cases uses MAP in tests to reflect introduction...

diff --git a/lib/aspectj/lib/aspectjrt.jar b/lib/aspectj/lib/aspectjrt.jar
index 03cb6fba145013c0785f85d466ad46edf585133d..104efa7bfc478eb4a223f88f048f0c094a2915b7 100644 (file)
Binary files a/lib/aspectj/lib/aspectjrt.jar and b/lib/aspectj/lib/aspectjrt.jar differ

diff --git a/lib/test/aspectjrt.jar b/lib/test/aspectjrt.jar
index 03cb6fba145013c0785f85d466ad46edf585133d..104efa7bfc478eb4a223f88f048f0c094a2915b7 100644 (file)
Binary files a/lib/test/aspectjrt.jar and b/lib/test/aspectjrt.jar differ

diff --git a/tests/java5/ataspectj/annotationGen/Deow.aj b/tests/java5/ataspectj/annotationGen/Deow.aj
index 8a50e33e3808cd594b28e1fd966524a2e9ec31cc..b07e88355ef728bdd83115274ee40c69ad222c38 100644 (file)
--- a/tests/java5/ataspectj/annotationGen/Deow.aj
+++ b/tests/java5/ataspectj/annotationGen/Deow.aj
@@ -13,7 +13,7 @@ public aspect Deow {
     if (!deows[1].isError()) throw new RuntimeException("Expecting an error");
     if (!deows[0].getMessage().equals("dont call system methods")) throw new RuntimeException("Bad message");
     if (!deows[1].getMessage().equals("dont call system methods")) throw new RuntimeException("Bad message");
-    if (!deows[0].getPointcutExpression().equals("call(* java.lang.System.*(..))")) throw new RuntimeException("Bad pc: " + deows[0].getPointcutExpression());
-    if (!deows[1].getPointcutExpression().equals("call(* java.lang.System.*(..))")) throw new RuntimeException("Bad pc: " + deows[0].getPointcutExpression());
+    if (!deows[0].getPointcutExpression().toString().equals("call(* java.lang.System.*(..))")) throw new RuntimeException("Bad pc: " + deows[0].getPointcutExpression());
+    if (!deows[1].getPointcutExpression().toString().equals("call(* java.lang.System.*(..))")) throw new RuntimeException("Bad pc: " + deows[0].getPointcutExpression());
   }
 }
\ No newline at end of file

diff --git a/tests/java5/ataspectj/annotationGen/ReferencePointcuts.aj b/tests/java5/ataspectj/annotationGen/ReferencePointcuts.aj
index 782021b24c095edc086405ccffe9f411e221a12f..e6014d7dadf1e5a37f2f3987d8defcd03dd3377a 100644 (file)
--- a/tests/java5/ataspectj/annotationGen/ReferencePointcuts.aj
+++ b/tests/java5/ataspectj/annotationGen/ReferencePointcuts.aj
@@ -9,10 +9,10 @@ public aspect ReferencePointcuts {
        public static void main(String[] args) throws NoSuchPointcutException {
                AjType myType = AjTypeSystem.getAjType(ReferencePointcuts.class);
                Pointcut p1 = myType.getPointcut("pc1");
-               if (!p1.getPointcutExpression().equals("call(* *(..))")) 
+               if (!p1.getPointcutExpression().toString().equals("call(* *(..))")) 
                        throw new RuntimeException("unexpected pc expression: " + p1.getPointcutExpression());
                Pointcut p2 = myType.getPointcut("pc2");
-               if (!p2.getPointcutExpression().equals("(pc1() || execution(* *(..)))")) 
+               if (!p2.getPointcutExpression().toString().equals("(pc1() || execution(* *(..)))")) 
                        throw new RuntimeException("unexpected pc expression: " + p2.getPointcutExpression());
 
        }