summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jdt.core/jdtcore-for-aspectj-src.zipbin4519762 -> 4519821 bytes
-rw-r--r--org.eclipse.jdt.core/jdtcore-for-aspectj.jarbin8336436 -> 8336348 bytes
-rw-r--r--tests/bugs186/romain/Code.java3
-rw-r--r--tests/bugs186/romain/Runner1.java5
-rw-r--r--tests/bugs186/romain/Runner2.java5
-rw-r--r--tests/bugs186/romain/SubCode.java2
-rw-r--r--tests/bugs186/romain/X.java3
-rw-r--r--tests/bugs186/romain/code1.jarbin0 -> 964 bytes
-rw-r--r--tests/bugs186/romain/code2.jarbin0 -> 2556 bytes
-rw-r--r--tests/src/org/aspectj/systemtest/ajc186/Ajc186Tests.java4
-rw-r--r--tests/src/org/aspectj/systemtest/ajc186/ajc186.xml10
11 files changed, 32 insertions, 0 deletions
diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
index c35fb62cd..26d854142 100644
--- a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
+++ b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
Binary files differ
diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
index cd33770a9..c7fd43fc9 100644
--- a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
+++ b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
Binary files differ
diff --git a/tests/bugs186/romain/Code.java b/tests/bugs186/romain/Code.java
new file mode 100644
index 000000000..9ae8ed102
--- /dev/null
+++ b/tests/bugs186/romain/Code.java
@@ -0,0 +1,3 @@
+public class Code {
+ public void foo() { System.out.println("foo");}
+}
diff --git a/tests/bugs186/romain/Runner1.java b/tests/bugs186/romain/Runner1.java
new file mode 100644
index 000000000..aa3b23d19
--- /dev/null
+++ b/tests/bugs186/romain/Runner1.java
@@ -0,0 +1,5 @@
+public class Runner1 {
+ public static void main(String[]argv) {
+ new SubCode().foo();
+ }
+}
diff --git a/tests/bugs186/romain/Runner2.java b/tests/bugs186/romain/Runner2.java
new file mode 100644
index 000000000..aa3b23d19
--- /dev/null
+++ b/tests/bugs186/romain/Runner2.java
@@ -0,0 +1,5 @@
+public class Runner1 {
+ public static void main(String[]argv) {
+ new SubCode().foo();
+ }
+}
diff --git a/tests/bugs186/romain/SubCode.java b/tests/bugs186/romain/SubCode.java
new file mode 100644
index 000000000..7136b3fe7
--- /dev/null
+++ b/tests/bugs186/romain/SubCode.java
@@ -0,0 +1,2 @@
+public class SubCode<T> {
+}
diff --git a/tests/bugs186/romain/X.java b/tests/bugs186/romain/X.java
new file mode 100644
index 000000000..d28c3e679
--- /dev/null
+++ b/tests/bugs186/romain/X.java
@@ -0,0 +1,3 @@
+public aspect X {
+ declare parents: SubCode extends Code;
+}
diff --git a/tests/bugs186/romain/code1.jar b/tests/bugs186/romain/code1.jar
new file mode 100644
index 000000000..a35660a3d
--- /dev/null
+++ b/tests/bugs186/romain/code1.jar
Binary files differ
diff --git a/tests/bugs186/romain/code2.jar b/tests/bugs186/romain/code2.jar
new file mode 100644
index 000000000..c4b5ce74e
--- /dev/null
+++ b/tests/bugs186/romain/code2.jar
Binary files differ
diff --git a/tests/src/org/aspectj/systemtest/ajc186/Ajc186Tests.java b/tests/src/org/aspectj/systemtest/ajc186/Ajc186Tests.java
index dc12ab3e4..aeb6c1621 100644
--- a/tests/src/org/aspectj/systemtest/ajc186/Ajc186Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc186/Ajc186Tests.java
@@ -21,6 +21,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
*/
public class Ajc186Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
+ public void testMissingExtends() throws Exception {
+ runTest("missing extends on generic target");
+ }
+
public void testMissingMethod_462821() throws Exception {
runTest("missing method");
}
diff --git a/tests/src/org/aspectj/systemtest/ajc186/ajc186.xml b/tests/src/org/aspectj/systemtest/ajc186/ajc186.xml
index ff2e1511b..69d0e0c05 100644
--- a/tests/src/org/aspectj/systemtest/ajc186/ajc186.xml
+++ b/tests/src/org/aspectj/systemtest/ajc186/ajc186.xml
@@ -7,4 +7,14 @@
</compile>
</ajc-test>
+<ajc-test dir="bugs186/romain" title="missing extends on generic target">
+<compile files="Code.java SubCode.java" options="-1.5" outjar="code.jar"/>
+<compile files="X.java Runner1.java" options="-1.5" inpath="code.jar"/>
+<run class="Runner1">
+<stdout>
+<line text="foo"/>
+</stdout>
+</run>
+</ajc-test>
+
</suite>