266220: generic aspect subtypes in aop.xml

diff --git a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
index 674700f6d4438cd03ff114d30401fc3c86b1d76f..cfc86fce98c75e51f10246089a714124aba478d6 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
@@ -32,6 +32,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc164Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+       public void testGenericsAopXml_pr266220() {
+               runTest("generics and aop.xml");
+       }
+
        public void testOptimizingIf_pr266165_1() {
                runTest("optimizing if for constant reference - 1");
        }
@@ -172,9 +176,11 @@ public class Ajc164Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
        }
 
        /**
-        * This test checks that local variable table for the interMethodDispatcher is built correctly, for the related code see
-        * IntertypeMethodDeclaration.generateDispatchMethod(). It checks non-static and static ITDs. Once the information here is
-        * correct then around advice on ITDs can also be correct.
+        * This test checks that local variable table for the interMethodDispatcher
+        * is built correctly, for the related code see
+        * IntertypeMethodDeclaration.generateDispatchMethod(). It checks non-static
+        * and static ITDs. Once the information here is correct then around advice
+        * on ITDs can also be correct.
         */
        public void testBrokenLVT_pr194314_3() throws Exception {
                runTest("broken lvt - 3");

diff --git a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
index 29bb149d824bbd7f525764e8265461373baeb5c3..ecdf7ef9fa3ec7c2b31513cec276b52db22e74bc 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
+++ b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
@@ -2,6 +2,19 @@
 
 <suite>
    
+   
+    <ajc-test dir="bugs164/pr266220" title="generics and aop.xml">
+        <compile files="Code.java"/>
+        <compile files="Isolator.java" outjar="aspects.jar" options="-1.5"/>
+        <run class="Code" classpath="aspects.jar" ltw="aop.xml">
+          <stdout>
+            <line text="execution(void Code.main(String[]))"/>
+            <line text="execution(void Code.run())"/>
+            <line text="running..."/>
+          </stdout>
+        </run>
+    </ajc-test>
+    
    <ajc-test dir="bugs164/pr266165" title="optimizing if for constant reference - 1">
      <compile files="NeverWeave.java" options="-1.5 -Xlint:ignore -showWeaveInfo"/>
    </ajc-test>