aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/bugs164/pr267559/Aspect.java4
-rw-r--r--tests/bugs164/pr267559/ClassA.java3
-rw-r--r--tests/bugs164/pr267559/ClassB.java3
-rw-r--r--tests/bugs164/pr267559/IMarker.java3
-rw-r--r--tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java4
-rw-r--r--tests/src/org/aspectj/systemtest/ajc164/ajc164.xml4
6 files changed, 21 insertions, 0 deletions
diff --git a/tests/bugs164/pr267559/Aspect.java b/tests/bugs164/pr267559/Aspect.java
new file mode 100644
index 000000000..0c51d82ab
--- /dev/null
+++ b/tests/bugs164/pr267559/Aspect.java
@@ -0,0 +1,4 @@
+public aspect Aspect
+{
+ public boolean IMarker<PARALLELSTATE>.c;
+}
diff --git a/tests/bugs164/pr267559/ClassA.java b/tests/bugs164/pr267559/ClassA.java
new file mode 100644
index 000000000..9345e7300
--- /dev/null
+++ b/tests/bugs164/pr267559/ClassA.java
@@ -0,0 +1,3 @@
+public class ClassA<T>
+{
+} \ No newline at end of file
diff --git a/tests/bugs164/pr267559/ClassB.java b/tests/bugs164/pr267559/ClassB.java
new file mode 100644
index 000000000..c706c8bb4
--- /dev/null
+++ b/tests/bugs164/pr267559/ClassB.java
@@ -0,0 +1,3 @@
+abstract public class ClassB<T> implements IMarker<ClassA<T>>
+{
+}
diff --git a/tests/bugs164/pr267559/IMarker.java b/tests/bugs164/pr267559/IMarker.java
new file mode 100644
index 000000000..43cc7ef03
--- /dev/null
+++ b/tests/bugs164/pr267559/IMarker.java
@@ -0,0 +1,3 @@
+public interface IMarker<H>
+{
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
index b70a06f18..14356587c 100644
--- a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
@@ -34,6 +34,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
public class Ajc164Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
+ public void testGenericsItdNpe_pr267559() {
+ runTest("generics and itd npe");
+ }
+
public void testAnnoStyleLong_pr266564() {
runTest("annotation style long");
}
diff --git a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
index 1e22bcad7..373d4b711 100644
--- a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
+++ b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
@@ -2,6 +2,10 @@
<suite>
+ <ajc-test dir="bugs164/pr267559" title="generics and itd npe">
+ <compile files="IMarker.java ClassB.java Aspect.java ClassA.java" options="-1.5"/>
+ </ajc-test>
+
<ajc-test dir="bugs164/pr266564" title="annotation style long">
<compile files="AA.java" options="-1.5"/>
<run class="business.AA"/>