148508, 265418: tests and fixes: array and varargs subtype patterns

diff --git a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
index a8f7b32c7229441666041fbb386df8cf764cfe97..2351c665f31f451a3562cd0a0461ef24a1865132 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
@@ -32,10 +32,18 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc164Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+       public void testParserProblemSubArrayPatterns_pr148508() {
+               runTest("parser problem for array subtypes");
+       }
+
+       public void testVarargs_pr265418() {
+               runTest("varargs");
+       }
+
        public void testIncorrectDateResolution_pr265360() {
                runTest("incorrect resolution of Date");
        }
-
+       
        public void testDualPreClinit_pr233032() {
                runTest("dual preClinit");
        }

diff --git a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
index 68e2125b78b4e6b0aee1067c0cd05888cf9734da..9dbe2547943ef3367015f1fce36ad9ba19cabe16 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
+++ b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
@@ -2,13 +2,34 @@
 
 <suite>
     
+    <ajc-test dir="bugs164/pr265418" title="varargs">
+      <compile files="A.java" options="-1.5"/>
+      <run class="A">
+        <stdout>
+          <line text="varargs call(void A.a(Object[]))"/>
+          <line text="varargs call(void A.b(String[]))"/>
+          <line text="varargs call(void A.c(Integer[]))"/>
+          <line text="arrays  call(void A.d(Object[]))"/>
+          <line text="arrays  call(void A.e(String[]))"/>
+          <line text="arrays  call(void A.f(Integer[]))"/>
+        </stdout>
+      </run>
+    </ajc-test>
+    
+   <ajc-test dir="bugs164" title="parser problem for array subtypes">
+     <compile files="PR148508.java"/>
+     <run class="PR148508">
+     </run>
+   </ajc-test>
+   
+    
     <ajc-test dir="bugs164/pr265360" title="incorrect resolution of Date">
       <compile files="Foo.java Main.java" options="-1.5">
         <message kind="warning" text="no match for this type name: Date "/>
         <message kind="warning" test="advice defined in"/>
       </compile>
     </ajc-test>
-    
+   
     <ajc-test dir="bugs164/pr233032" title="dual preClinit">
       <compile files="A.java" options="-1.5"/>
       <run class="A"/>