Update JDT to 2b07958

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
index f3beb1e0324cf8a8969ff0d7af7a59c2c59dde26..11a8c560f4c17b392116a0b8bed5c05ab3f99bfc 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip and b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip differ

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
index 29699c32582dad9ce34dc96b486332628440a9a1..83e44280738712a36716ed21a9aaf302a07b8c64 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar and b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar differ

diff --git a/testing/newsrc/org/aspectj/testing/AntSpec.java b/testing/newsrc/org/aspectj/testing/AntSpec.java
index 5eaa087d5636bfb8d5babbd6670d2a13fddf7243..fe6a961b584d1d75db4fac18575a21a6b288820d 100644 (file)
--- a/testing/newsrc/org/aspectj/testing/AntSpec.java
+++ b/testing/newsrc/org/aspectj/testing/AntSpec.java
@@ -194,7 +194,11 @@ public class AntSpec implements ITestStep {
                        m_stdOutSpec.matchAgainst(stdout.toString());
                }
                if (m_stdErrSpec != null) {
-                       m_stdErrSpec.matchAgainst(stderr.toString());
+                       String stderr2 = stderr.toString();
+                       if (stderr2.indexOf("Class JavaLaunchHelper is implemented in both")!=-1 && stderr2.indexOf('\n')!=-1) {
+                               stderr2 = stderr2.substring(stderr2.indexOf('\n')+1);
+                       }
+                       m_stdErrSpec.matchAgainst(stderr2);
                }
        }
 

diff --git a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java b/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java
index 652839a5b9d167ae6213120fc956bee3193fc977..0126d29b32ed81d6358f810dcfb917bdc2415240 100644 (file)
--- a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java
+++ b/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java
@@ -28,6 +28,7 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.commons.digester.Digester;
+import org.aspectj.apache.bcel.classfile.Attribute;
 import org.aspectj.apache.bcel.classfile.JavaClass;
 import org.aspectj.apache.bcel.classfile.LocalVariable;
 import org.aspectj.apache.bcel.classfile.LocalVariableTable;
@@ -322,6 +323,18 @@ public abstract class XMLBasedAjcTestCase extends AjcTestCase {
                return getMethodStartsWith(jc,prefix,1);
        }
        
+       protected Attribute getAttributeStartsWith(Attribute[] attributes, String prefix) {
+               StringBuilder buf = new StringBuilder();
+               for (Attribute a: attributes) {
+                       if (a.getName().startsWith(prefix)) {
+                               return a;
+                       }
+                       buf.append(a.toString()).append("\n");
+               }
+               fail("Failed to find '"+prefix+"' in attributes:\n"+buf.toString());
+               return null;
+       }
+       
        protected Method getMethodStartsWith(JavaClass jc, String prefix, int whichone) {
                Method[] meths = jc.getMethods();
                for (int i = 0; i < meths.length; i++) {