summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2011-02-08 16:22:42 +0000
committeraclement <aclement>2011-02-08 16:22:42 +0000
commit09af5acb0c35cfcc90b85bb465313c7903d32c20 (patch)
treed4c822c8c14378b5d9946e5b94587804fc9de1fa
parent5648105b8450a0f0121bd49b65eae21eb135398f (diff)
downloadaspectj-09af5acb0c35cfcc90b85bb465313c7903d32c20.tar.gz
aspectj-09af5acb0c35cfcc90b85bb465313c7903d32c20.zip
336471: makeEJSP
-rw-r--r--tests/bugs1611/pr336471/Tester.aj25
-rw-r--r--tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java4
-rw-r--r--tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml11
3 files changed, 40 insertions, 0 deletions
diff --git a/tests/bugs1611/pr336471/Tester.aj b/tests/bugs1611/pr336471/Tester.aj
new file mode 100644
index 000000000..4603a4d62
--- /dev/null
+++ b/tests/bugs1611/pr336471/Tester.aj
@@ -0,0 +1,25 @@
+
+aspect Tester {
+ before(): call(* Foo.*(..)) {
+ System.out.println(thisEnclosingJoinPointStaticPart);
+ }
+ public static void main(String[] args) {
+ new Foo().run();
+ }
+}
+
+class Foo {
+ int i = 5;
+ public void run() {
+ bar("abc");
+ }
+
+ public void bar(String s) {
+ System.out.println("hello");
+ i = 4;
+ }
+}
+
+class MyException extends Exception {
+
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
index 064220b46..5c8149090 100644
--- a/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc1611/Ajc1611Tests.java
@@ -21,6 +21,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
*/
public class Ajc1611Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
+ public void testESJP_336471() {
+ runTest("esjp");
+ }
+
public void testITIT_336136() {
runTest("itit");
}
diff --git a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
index 97c68923f..c5c51012b 100644
--- a/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
+++ b/tests/src/org/aspectj/systemtest/ajc1611/ajc1611.xml
@@ -2,6 +2,17 @@
<suite>
+ <ajc-test dir="bugs1611/pr336471" title="esjp">
+ <compile files="Tester.aj" options="-1.5 -Xset:targetRuntime1_6_10=true"/>
+ <run class="Tester">
+ <stdout>
+ <line text="execution(void Tester.main(String[]))"/>
+ <line text="execution(void Foo.run())"/>
+ <line text="hello"/>
+ </stdout>
+ </run>
+ </ajc-test>
+
<ajc-test dir="bugs1611/pr336136" title="itit">
<compile files="Country_Roo_Op4j.java">
<message kind="error" text="The import com.foo cannot be resolved" line="1"/>