summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2011-04-08 23:19:42 +0000
committeraclement <aclement>2011-04-08 23:19:42 +0000
commit80ceb419315961eae603911721155dfb560e99dd (patch)
treea6cd967ffc49a3be64b281e0ed80718fc51600ee
parentcda3a429ec876021856ac343d91f81db0a1a39b7 (diff)
downloadaspectj-80ceb419315961eae603911721155dfb560e99dd.tar.gz
aspectj-80ceb419315961eae603911721155dfb560e99dd.zip
342323
-rw-r--r--tests/bugs1612/pr342323/Azpect.java12
-rw-r--r--tests/bugs1612/pr342323/Bean.java11
-rw-r--r--tests/bugs1612/pr342323/Runner.java14
-rw-r--r--tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java4
-rw-r--r--tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml13
5 files changed, 54 insertions, 0 deletions
diff --git a/tests/bugs1612/pr342323/Azpect.java b/tests/bugs1612/pr342323/Azpect.java
new file mode 100644
index 000000000..e618f3185
--- /dev/null
+++ b/tests/bugs1612/pr342323/Azpect.java
@@ -0,0 +1,12 @@
+package ppp;
+privileged aspect Azpect {
+ public void Bean.foo() {
+ Runnable r = new Runnable() {
+ public void run() {
+ System.out.println("aspect foo");
+ }
+ };
+ r.run();
+ }
+}
+
diff --git a/tests/bugs1612/pr342323/Bean.java b/tests/bugs1612/pr342323/Bean.java
new file mode 100644
index 000000000..d1ab95730
--- /dev/null
+++ b/tests/bugs1612/pr342323/Bean.java
@@ -0,0 +1,11 @@
+package ppp;
+public class Bean {
+ public void m() {
+ Runnable r = new Runnable() { public void run() { System.out.println("class");}};
+ r.run();
+ }
+ public void n() {
+ Runnable r = new Runnable() { public void run() { System.out.println("class");}};
+ r.run();
+ }
+}
diff --git a/tests/bugs1612/pr342323/Runner.java b/tests/bugs1612/pr342323/Runner.java
new file mode 100644
index 000000000..71a2b974e
--- /dev/null
+++ b/tests/bugs1612/pr342323/Runner.java
@@ -0,0 +1,14 @@
+package ppp;
+public class Runner {
+ public static void main(String[] argv) {
+ new Runner().run();
+ }
+
+ public void run() {
+ Bean c = new Bean();
+ System.out.println("Calling regular method");
+ c.m();
+ System.out.println("Calling itd method");
+ c.foo();
+ }
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java b/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java
index 5af06a3cd..3a1156f42 100644
--- a/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java
@@ -21,6 +21,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
*/
public class Ajc1612Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
+ public void testClashingLocalTypes_342323() {
+ runTest("clashing local types");
+ }
+
public void testITIT_338175() {
runTest("itit");
}
diff --git a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
index f32b5497e..d8895fecc 100644
--- a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
+++ b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
@@ -2,6 +2,19 @@
<suite>
+
+ <ajc-test dir="bugs1612/pr342323" title="clashing local types">
+ <compile files="Runner.java Bean.java Azpect.java" options="-1.5"/>
+ <run class="ppp.Runner">
+ <stdout>
+ <line text="Calling regular method"/>
+ <line text="class"/>
+ <line text="Calling itd method"/>
+ <line text="aspect foo"/>
+ </stdout>
+ </run>
+ </ajc-test>
+
<ajc-test dir="bugs1612/pr338175" title="itit">
<compile files="pack1/Aspect.java pack2/Java.java pack2/Java2.java" options="-1.5">
<message kind="error" text="Duplicate nested type ITIT"/>