247742: anonymous handles: c3

diff --git a/tests/model/expected/pr77269_1.txt b/tests/model/expected/pr77269_1.txt
index 71c826f645784c6187fc3f4fcfded6547d94764a..bdd591ea8055a46032b4e7d7e8ffacfa979a5891 100644 (file)
--- a/tests/model/expected/pr77269_1.txt
+++ b/tests/model/expected/pr77269_1.txt
@@ -14,8 +14,8 @@
         before(): p..  [advice] TEST_SANDBOX\pack\pr77269.aj:21:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) <pack*pr77269.aj[Test~testMethod[new Runnable~run (advised by) <pack*pr77269.aj}A&before
-(targets=1) <pack*pr77269.aj}A&before (advises) <pack*pr77269.aj[Test~testMethod[new Runnable~run
+(targets=1) <pack*pr77269.aj[Test~testMethod[~run (advised by) <pack*pr77269.aj}A&before
+(targets=1) <pack*pr77269.aj}A&before (advises) <pack*pr77269.aj[Test~testMethod[~run
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=3

diff --git a/tests/model/expected/pr77269_3.txt b/tests/model/expected/pr77269_3.txt
index 8e45449a3613aa87425d875bf4e6e4b5dd52a1df..48fae6a5f051823c9c0fc33d3071ab0fce3bc298 100644 (file)
--- a/tests/model/expected/pr77269_3.txt
+++ b/tests/model/expected/pr77269_3.txt
@@ -13,8 +13,8 @@
         declare warning: "blah blah blah"  [declare warning] TEST_SANDBOX\pack\pr77269c.aj:18:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
-(targets=1) <pack*pr77269c.aj}A`declare warning (matched by) <pack*pr77269c.aj[Test~testMethod[new Runnable~run?method-call(void pack.Test.someMethod())
-(targets=1) <pack*pr77269c.aj[Test~testMethod[new Runnable~run?method-call(void pack.Test.someMethod()) (matches declare) <pack*pr77269c.aj}A`declare warning
+(targets=1) <pack*pr77269c.aj}A`declare warning (matched by) <pack*pr77269c.aj[Test~testMethod[~run?method-call(void pack.Test.someMethod())
+(targets=1) <pack*pr77269c.aj[Test~testMethod[~run?method-call(void pack.Test.someMethod()) (matches declare) <pack*pr77269c.aj}A`declare warning
 === END OF RELATIONSHIPS REPORT ==
 === Properties of the model and relationships map =====
 method=3

diff --git a/tests/multiIncremental/AdviceHandles/base/src/Handles.aj b/tests/multiIncremental/AdviceHandles/base/src/Handles.aj
index 2dfa89908d0469e3ff863dda6310101ef429e641..f92a314beee873e0d527282f29349c64fdb290dc 100644 (file)
--- a/tests/multiIncremental/AdviceHandles/base/src/Handles.aj
+++ b/tests/multiIncremental/AdviceHandles/base/src/Handles.aj
@@ -56,5 +56,19 @@ public aspect Handles {
     new I() {};
   }
        
+
+//Line60: 247742: c3 
+void b(String x) {
+  new Condition() {}; // l62
+  new Condition() {}; // l63
+}
+
+
 }
 
+class Condition {}
+
+aspect Foo { // Line 71: 247742: c4
+ after(String x) returning(String y) : within(NotExisting*) {  } //src<p*Foo.aj[Foo*&afterReturning&QString;
+ after(String x) returning(int y) : within(NotExisting*) {  }    //src<p*Foo.aj[Foo*&afterReturning&QString;!2
+}

diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
index 5ba55016365bcbe39537b6a19b23612072b69856..193f696d16c6104ac5a8f41876b806b2db36d58f 100644 (file)
--- a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
@@ -188,11 +188,16 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
                IProgramElement namedInnerClass = findElementAtLine(root, 46);
                assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Handles~x[NamedClass", namedInnerClass.getHandleIdentifier());
 
-               IProgramElement anonInner1 = findElementAtLine(root, 55);
-               assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Handles~foo[new I", anonInner1.getHandleIdentifier());
+               assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Handles~foo[", findElementAtLine(root, 55).getHandleIdentifier());
+               assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Handles~foo[!2", findElementAtLine(root, 56).getHandleIdentifier());
 
-               IProgramElement anonInner2 = findElementAtLine(root, 56);
-               assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Handles~foo[new I!2", anonInner2.getHandleIdentifier());
+               // From 247742: comment 3
+               assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Handles~b~QString;[", findElementAtLine(root, 62).getHandleIdentifier());
+               assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Handles~b~QString;[!2", findElementAtLine(root, 63).getHandleIdentifier());
+
+//             // From 247742: comment 4
+//             assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Foo&afterReturning&QString;", findElementAtLine(root, 72).getHandleIdentifier());
+//             assertEquals("=AdviceHandles/src<spacewar*Handles.aj}Foo&afterReturning&QString;!2", findElementAtLine(root, 73).getHandleIdentifier());
 
        }
 
@@ -303,15 +308,15 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
        }
 
        // 
-       public void testAspectPath_pr242797_c41() {
-               String bug = "pr242797_3";
-               String bug2 = "pr242797_4";
-               initialiseProject(bug);
-               initialiseProject(bug2);
-               configureAspectPath(bug2, getProjectRelativePath(bug, "bin"));
-               build(bug);
-               build(bug2);
-       }
+//     public void testAspectPath_pr242797_c41() {
+//             String bug = "pr242797_3";
+//             String bug2 = "pr242797_4";
+//             initialiseProject(bug);
+//             initialiseProject(bug2);
+//             configureAspectPath(bug2, getProjectRelativePath(bug, "bin"));
+//             build(bug);
+//             build(bug2);
+//     }
 
        /**
         * Build a project containing a resource - then mark the resource readOnly(), then do an inc-compile, it will report an error