summaryrefslogtreecommitdiffstats
path: root/tests/model
diff options
context:
space:
mode:
authoraclement <aclement>2008-09-16 23:24:16 +0000
committeraclement <aclement>2008-09-16 23:24:16 +0000
commit95f9ea7929dfa2b55a957461a2db8e395b11a797 (patch)
tree2d6220ad60e051d07e5f21f65dc56376cf488fbb /tests/model
parent6a68dba947ddd49e8e8dea06e17f1412535c1cb8 (diff)
downloadaspectj-95f9ea7929dfa2b55a957461a2db8e395b11a797.tar.gz
aspectj-95f9ea7929dfa2b55a957461a2db8e395b11a797.zip
supporting multiple source folders in the model - to ensure handles compatible with JDT
Diffstat (limited to 'tests/model')
-rw-r--r--tests/model/expected/pr160469_1.txt4
-rw-r--r--tests/model/expected/pr77269_1.txt4
-rw-r--r--tests/model/expected/pr77269_3.txt4
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/model/expected/pr160469_1.txt b/tests/model/expected/pr160469_1.txt
index 7a0d90850..0a33af51b 100644
--- a/tests/model/expected/pr160469_1.txt
+++ b/tests/model/expected/pr160469_1.txt
@@ -15,9 +15,9 @@
=== END OF MODEL REPORT =========
=== RELATIONSHIPS REPORT ========= After a batch build
(targets=1) <pkg[AbstractBeanConfigurerAspect.class (binary)}AbstractBeanConfigurerAspect&afterReturning (advises) <test{Simple.java[Simple~Simple
-(targets=1) <pkg[AbstractBeanConfigurerAspect.class (binary)}AbstractBeanConfigurerAspect&before (advises) <test{Simple.java[Simple~Simple
+(targets=1) <pkg[AbstractBeanConfigurerAspect.class (binary)}AbstractBeanConfigurerAspect&before!2 (advises) <test{Simple.java[Simple~Simple
(targets=2) <test{Simple.java[Simple~Simple (advised by) <pkg[AbstractBeanConfigurerAspect.class (binary)}AbstractBeanConfigurerAspect&afterReturning
-(targets=2) <test{Simple.java[Simple~Simple (advised by) <pkg[AbstractBeanConfigurerAspect.class (binary)}AbstractBeanConfigurerAspect&before
+(targets=2) <test{Simple.java[Simple~Simple (advised by) <pkg[AbstractBeanConfigurerAspect.class (binary)}AbstractBeanConfigurerAspect&before!2
=== END OF RELATIONSHIPS REPORT ==
=== Properties of the model and relationships map =====
import reference=2
diff --git a/tests/model/expected/pr77269_1.txt b/tests/model/expected/pr77269_1.txt
index 204502765..a5ef46b3c 100644
--- 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}A&before (advises) <pack*pr77269.aj[Test~testMethod[new Runnable() {..}~run
-(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[new Runnable~run (advised by) <pack*pr77269.aj}A&before
=== 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 02f10cfa1..8e45449a3 100644
--- 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[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
=== END OF RELATIONSHIPS REPORT ==
=== Properties of the model and relationships map =====
method=3