test and fix for 171952: method overriding with ITD using generic return values

diff --git a/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java b/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java
index c0b562ac2b0257add813a48f0f1eb485094a674f..79dfe4c1877a696fea8943c611afdc207c79fc88 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc160/Ajc160Tests.java
@@ -21,6 +21,8 @@ import junit.framework.Test;
  */
 public class Ajc160Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
        
+  public void testGenericMethodsAndItds_pr171952() { runTest("generic methods and ITDs");}
+  //public void testUsingDecpAnnotationWithoutAspectAnnotation_pr169428() { runTest("using decp annotation without aspect annotation");}
   public void testItdsParameterizedParameters_pr170467() { runTest("itds and parameterized parameters");}
   public void testComplexGenerics_pr168044() { runTest("complex generics - 1");}
   public void testIncorrectlyMarkingFieldTransient_pr168063() { runTest("incorrectly marking field transient");}

diff --git a/tests/src/org/aspectj/systemtest/ajc160/ajc160.xml b/tests/src/org/aspectj/systemtest/ajc160/ajc160.xml
index b2793eb8c310b91ec1a6fc05fd690aeb5329fbe5..bdca3440d52b98d550471f3e0cb1ef2f7113fb95 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc160/ajc160.xml
+++ b/tests/src/org/aspectj/systemtest/ajc160/ajc160.xml
@@ -5,12 +5,21 @@
 
  <!-- first section - dont need a 1.6 vm but fixed in the 1.6 branch of AspectJ -->
  
+    <ajc-test dir="bugs160/pr171952" title="generic methods and ITDs">
+      <compile files="Foo.java,FooAspect.java" options="-1.5"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs160/pr169428" title="using decp annotation without aspect annotation">
+      <compile files="AnAspect.java" options="-1.5">
+        <message kind="error" text="Found @AspectJ annotations in a non @Aspect type 'AnAspect'"/>
+      </compile>
+    </ajc-test>
+    
     <ajc-test dir="bugs160/pr170467" title="itds and parameterized parameters">
       <compile files="Bug.aj" options="-1.5"/>
       <compile files="Bug2.aj" options="-1.5"/>
     </ajc-test>
     
-    
     <ajc-test dir="bugs160/pr169706" title="inherited annotations">
       <compile files="A.java,B.java,C.java,MyAspect.java,MyAnnotation.java,Test.java" options="-1.5 -showWeaveInfo">
         <message kind="weave" text="Join point 'method-call(void C.foo())' in Type 'Test' (Test.java:5) advised by before advice from 'MyAspect' (MyAspect.java:4)"/>