267559: generics itd npe

diff --git a/tests/bugs164/pr267559/Aspect.java b/tests/bugs164/pr267559/Aspect.java
new file mode 100644 (file)
index 0000000..0c51d82
--- /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 (file)
index 0000000..9345e73
--- /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 (file)
index 0000000..c706c8b
--- /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 (file)
index 0000000..43cc7ef
--- /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 b70a06f186798c13756a4b21b542d0d56212b908..14356587c62d5a8ad772c3aec1209953ac5a4c7c 100644 (file)
--- 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 1e22bcad7621ae3a3ad61c7d2502b77476473aeb..373d4b71174f93762109676a4aa22e09b299eb35 100644 (file)
--- 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"/>