fixed up testcase field sigs

diff --git a/tests/bugs170/xmldefs/aop4.xml b/tests/bugs170/xmldefs/aop4.xml
index 1cf61807b84a8ece7052dac0bc3b6a9589e66b77..a6633b032034817c8549080186315f7f116b11d4 100644 (file)
--- a/tests/bugs170/xmldefs/aop4.xml
+++ b/tests/bugs170/xmldefs/aop4.xml
@@ -2,11 +2,11 @@
 <aspectj>
   <aspects>
     <concrete-aspect name="ConjuredUp">
-      <declare-annotation field="* field1(..)" annotation="@AnnoString(&quot;set from xml&quot;)"/>
-      <declare-annotation field="* field1(..)" annotation="@AnnoLong(999)"/>
-      <declare-annotation field="* field1(..)" annotation="@AnnoBoolean(true)"/>
-      <declare-annotation field="* field1(..)" annotation="@AnnoClass(Integer.class)"/>
-      <declare-annotation field="* field2(..)" annotation="@AnnoClass()"/> <!-- testing empty paren -->
+      <declare-annotation field="* field1" annotation="@AnnoString(&quot;set from xml&quot;)"/>
+      <declare-annotation field="* field1" annotation="@AnnoLong(999)"/>
+      <declare-annotation field="* field1" annotation="@AnnoBoolean(true)"/>
+      <declare-annotation field="* field1" annotation="@AnnoClass(Integer.class)"/>
+      <declare-annotation field="* field2" annotation="@AnnoClass()"/> <!-- testing empty paren -->
     </concrete-aspect>
   </aspects>
 

diff --git a/tests/bugs170/xmldefs/aop5.xml b/tests/bugs170/xmldefs/aop5.xml
index 31a5f7d482aa9359bcc3b420fb92c1f1bd264f0a..67f9b6eee58dd2fd5c14388650a29716a9f2b842 100644 (file)
--- a/tests/bugs170/xmldefs/aop5.xml
+++ b/tests/bugs170/xmldefs/aop5.xml
@@ -2,12 +2,12 @@
 <aspectj>
   <aspects>
     <concrete-aspect name="ConjuredUp">
-      <declare-annotation field="* field1(..)" annotation="@AnnoShort(8)"/>
-      <declare-annotation field="* field1(..)" annotation="@AnnoChar('z')"/>
-      <declare-annotation field="* field1(..)" annotation="@AnnoDouble(99.0d)"/>
-      <declare-annotation field="* field1(..)" annotation="@AnnoFloat(6.0f)"/>
-      <declare-annotation field="* field2(..)" annotation="@AnnoByte(88)"/> 
-      <declare-annotation field="* field2(..)" annotation="@AnnoInt(99)"/> 
+      <declare-annotation field="* field1" annotation="@AnnoShort(8)"/>
+      <declare-annotation field="* field1" annotation="@AnnoChar('z')"/>
+      <declare-annotation field="* field1" annotation="@AnnoDouble(99.0d)"/>
+      <declare-annotation field="* field1" annotation="@AnnoFloat(6.0f)"/>
+      <declare-annotation field="* field2" annotation="@AnnoByte(88)"/> 
+      <declare-annotation field="* field2" annotation="@AnnoInt(99)"/> 
     </concrete-aspect>
   </aspects>
 

diff --git a/tests/bugs170/xmldefs/aop6a.xml b/tests/bugs170/xmldefs/aop6a.xml
index 2c6410a9b0f1dcb376ac6cc94452ce493dfbf22f..99f07060125a01fa25bee8a825bbe9344973b024 100644 (file)
--- a/tests/bugs170/xmldefs/aop6a.xml
+++ b/tests/bugs170/xmldefs/aop6a.xml
@@ -2,7 +2,7 @@
 <aspectj>
   <aspects>
     <concrete-aspect name="ConjuredUp">
-      <declare-annotation field="* field1(..)" annotation="@Annot( a=  'a'   ,  fred = false,   'abc'  )"/>
+      <declare-annotation field="* field1" annotation="@Annot( a=  'a'   ,  fred = false,   'abc'  )"/>
     </concrete-aspect>
   </aspects>