From: Andy Clement <aclement@gopivotal.com>
Date: Thu, 7 Aug 2014 22:06:16 +0000 (-0700)
Subject: Update JDT to 2b07958
X-Git-Tag: V1_8_2~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7ca261cce0b5cdb5bcd31249002b35b948604b9e;p=aspectj.git

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 f3beb1e03..11a8c560f 100644
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 29699c325..83e442807 100644
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 5eaa087d5..fe6a961b5 100644
--- 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 652839a5b..0126d29b3 100644
--- 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++) {