286375: test and fix: recursive decl npe

diff --git a/tests/bugs166/pr286375/DatabaseOperationMonitor.java b/tests/bugs166/pr286375/DatabaseOperationMonitor.java
new file mode 100644 (file)
index 0000000..22ef1a2
--- /dev/null
+++ b/tests/bugs166/pr286375/DatabaseOperationMonitor.java
@@ -0,0 +1,5 @@
+privileged public abstract aspect DatabaseOperationMonitor<T extends AggregatedDatabaseStats<T>> extends BaseOperationMonitor<T> {}
+class BaseOperationMonitor<P> {}
+class AggregatedDatabaseStats<Q> {}
+class Wibble extends AggregatedDatabaseStats<Wibble> {}
+aspect Foo extends DatabaseOperationMonitor<Wibble> {}

diff --git a/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java b/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java
index 62355aa4bb2867510ddf38fd2d98949b9539578e..e906be45c2b368107380af18c8cafc77a2d53ee6 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc166/Ajc166Tests.java
@@ -18,13 +18,18 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc166Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+//     public void testITDannos_288049() {
+//             runTest("itd decanno");
+//     }
+
        public void testMungerCCE_288635() {
                runTest("munger cce");
        }
 
-       // public void testNPEonBadAspectDecl_286375() {
-       // runTest("npe on bad aspect decl");
-       // }
+       public void testNPEonBadAspectDecl_286375() {
+               runTest("npe on bad aspect decl");
+       }
+
        //
        // public void testAnnoModifierOrdering_287597_1() {
        // runTest("anno modifier ordering - 1");

diff --git a/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml b/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml
index bb873164e379daa7280a55f1e9d1f3829cc3e14a..f6ac19c622cb2ac7b0514ada2e3c9abec783907a 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml
+++ b/tests/src/org/aspectj/systemtest/ajc166/ajc166.xml
@@ -2,11 +2,14 @@
 
 <suite>
 
+  <ajc-test dir="bugs166/pr288049" title="itd decanno">
+     <compile files="org/tests/AClass.java org/tests/ASubClass.java org/tests/DeclareAnns.aj" options="-1.5"/>
+  </ajc-test>
+  
   <ajc-test dir="bugs166/pr288635" title="munger cce">
      <compile files="org/tests/atann/AddAnnotations.aj org/tests/atann/AddITDDoMethod.aj org/tests/atann/InterceptTraceds.aj org/tests/atann/TestClass.java org/tests/atann/Traced.java" options="-1.5"/>
      <run class="org.tests.atann.TestClass"/>
   </ajc-test>
-  
    
   <ajc-test dir="bugs166/pr286375" title="npe on bad aspect decl">
      <compile files="DatabaseOperationMonitor.java" options="-1.5" outjar="wibble.jar"/>