summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2011-04-27 20:54:05 +0000
committeraclement <aclement>2011-04-27 20:54:05 +0000
commit63b41bcc254ccca230d910396ebc36ec6ab7845b (patch)
tree78f70771a1e9b98c60affa8bb27bf69663381d08
parentf8ff09094b862b63ec44f8215f8e70337b93cb57 (diff)
downloadaspectj-63b41bcc254ccca230d910396ebc36ec6ab7845b.tar.gz
aspectj-63b41bcc254ccca230d910396ebc36ec6ab7845b.zip
344005: fix. Tests are in here but unfinished.
-rw-r--r--tests/bugs1612/pr344005/Anno.java4
-rw-r--r--tests/bugs1612/pr344005/Azpect.java12
-rw-r--r--tests/bugs1612/pr344005/Types.java12
-rw-r--r--tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java4
-rw-r--r--tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml6
5 files changed, 38 insertions, 0 deletions
diff --git a/tests/bugs1612/pr344005/Anno.java b/tests/bugs1612/pr344005/Anno.java
new file mode 100644
index 000000000..148fd7c4c
--- /dev/null
+++ b/tests/bugs1612/pr344005/Anno.java
@@ -0,0 +1,4 @@
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@interface Anno {}
diff --git a/tests/bugs1612/pr344005/Azpect.java b/tests/bugs1612/pr344005/Azpect.java
new file mode 100644
index 000000000..55bb73c03
--- /dev/null
+++ b/tests/bugs1612/pr344005/Azpect.java
@@ -0,0 +1,12 @@
+interface Marker {
+
+void doit(String s);
+}
+
+aspect Azpect {
+ declare parents: (@Anno *) implements Marker;
+
+ public void Marker.doit(String t) {}
+
+ before(Marker m): execution(void m()) && this(m) {}
+}
diff --git a/tests/bugs1612/pr344005/Types.java b/tests/bugs1612/pr344005/Types.java
new file mode 100644
index 000000000..7a1399970
--- /dev/null
+++ b/tests/bugs1612/pr344005/Types.java
@@ -0,0 +1,12 @@
+public class Types {
+}
+
+//@Anno
+//class X {
+// public void m() {}
+//}
+
+@Anno
+class Y<T> {
+ public void m() {}
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java b/tests/src/org/aspectj/systemtest/ajc1612/Ajc1612Tests.java
index b73590c22..0855ec495 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 testDecpGenerics_344005() {
+// runTest("decp generics");
+// }
+
public void testIllegalAccessError_343051() {
runTest("illegalaccesserror");
}
diff --git a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
index 8d7e710f5..1707b4dcd 100644
--- a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
+++ b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml
@@ -2,6 +2,12 @@
<suite>
+<ajc-test dir="bugs1612/pr344005" title="decp generics">
+<compile files="Anno.java Types.java Azpect.java" options="-1.5 -showWeaveInfo">
+<message kind="weave" text="XX"/>
+</compile>
+</ajc-test>
+
<ajc-test dir="bugs1612/pr343051" title="illegalaccesserror">
<compile files="Code.java Code2.java Azpect.java" options="-1.5"/>
<run class="p.Code">