aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authoracolyer <acolyer>2004-03-15 15:11:16 +0000
committeracolyer <acolyer>2004-03-15 15:11:16 +0000
commit2ed4c9f470df51b8621edda4451ad1768c36c1d5 (patch)
tree88c417ea4dab864f82c3155d4c35cd259d8ea04a /tests
parent40680b6fe4d28b2d061fc4cf9b3efa6640c12f44 (diff)
downloadaspectj-2ed4c9f470df51b8621edda4451ad1768c36c1d5.tar.gz
aspectj-2ed4c9f470df51b8621edda4451ad1768c36c1d5.zip
move weaving to inside of the compiler.compile loop.
ensure messages are associated with source wherever possible
Diffstat (limited to 'tests')
-rw-r--r--tests/ajcTests.xml12
-rw-r--r--tests/incremental/initialTests/aspectSourceAdded/Detour.20.java7
-rw-r--r--tests/incremental/initialTests/aspectSourceAdded/Main.java9
-rw-r--r--tests/incremental/initialTests/suite.xml11
4 files changed, 39 insertions, 0 deletions
diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index 1897a556b..6aa96ee2e 100644
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -7275,4 +7275,16 @@
<run class="SuperClosure" />
</ajc-test>
+ <ajc-test dir="incremental/initialTests/aspectSourceAdded"
+ title="add aspect source file and check world is rewoven"
+ keywords="incremental-test" >
+ <compile staging="true"
+ options="-incremental"
+ sourceroots="."/>
+ <inc-compile tag="20">
+ <dir-changes added="Detour"/>
+ </inc-compile>
+ <run class="Main"/>
+ </ajc-test>
+
</suite>
diff --git a/tests/incremental/initialTests/aspectSourceAdded/Detour.20.java b/tests/incremental/initialTests/aspectSourceAdded/Detour.20.java
new file mode 100644
index 000000000..4cc707b99
--- /dev/null
+++ b/tests/incremental/initialTests/aspectSourceAdded/Detour.20.java
@@ -0,0 +1,7 @@
+public aspect Detour {
+
+ void around() : execution(* Main.main(..)) {
+ System.out.println("Main class successfully woven");
+ }
+
+} \ No newline at end of file
diff --git a/tests/incremental/initialTests/aspectSourceAdded/Main.java b/tests/incremental/initialTests/aspectSourceAdded/Main.java
new file mode 100644
index 000000000..7c85f90c2
--- /dev/null
+++ b/tests/incremental/initialTests/aspectSourceAdded/Main.java
@@ -0,0 +1,9 @@
+import org.aspectj.testing.Tester;
+
+public class Main {
+
+ public static void main(String[] args) {
+ Tester.checkFailed("Incremental compilation did not appear to (re)weave Main");
+ }
+
+} \ No newline at end of file
diff --git a/tests/incremental/initialTests/suite.xml b/tests/incremental/initialTests/suite.xml
index b6b568384..95e52be1f 100644
--- a/tests/incremental/initialTests/suite.xml
+++ b/tests/incremental/initialTests/suite.xml
@@ -105,5 +105,16 @@
<run class="Main"/>
</ajc-test>
+ <ajc-test dir="aspectSourceAdded"
+ title="add aspect source file and check world is rewoven"
+ keywords="incremental-test" >
+ <compile staging="true"
+ options="-incremental"
+ sourceroots="."/>
+ <inc-compile tag="20">
+ <dir-changes added="Detour"/>
+ </inc-compile>
+ <run class="Main"/>
+ </ajc-test>
</suite>