Committed Deepak's patch to fix bug 335284: OpenFromClipboardTests causes NPEs and test failures

2 files changed, 10 insertions, 5 deletions

diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java
index 38a4d9749..fd02368c4 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AutomatedSuite.java
@@ -279,8 +279,8 @@ public class AutomatedSuite extends DebugSuite {
 	// Variables View Detail Pane tests
 		addTest(new TestSuite(DetailPaneManagerTests.class));
 
-	// Open from Clipboard action tests
-		addTest(new TestSuite(OpenFromClipboardTests.class));
+	// Open from Clipboard action tests - Need to use #suite() because the test has a custom setup
+		addTest(OpenFromClipboardTests.suite());
 	}
 	
 	protected static boolean isJ2SE15Compatible() {
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java
index babb82a98..3cd4f0de9 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java
@@ -30,6 +30,7 @@ import org.eclipse.jdt.debug.testplugin.JavaProjectHelper;
 import org.eclipse.jdt.internal.debug.ui.actions.OpenFromClipboardAction;
 import org.eclipse.jdt.launching.IVMInstall;
 import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.swt.widgets.Display;
 
 /**
  * Tests the Open from Clipboard action.
@@ -122,9 +123,13 @@ public class OpenFromClipboardTests extends TestCase {
 		return ((Integer) returnValue).intValue();
 	}
 
-	private List getJavaElementMatches(String textData) {
-		List matches = new ArrayList();
-		fAccessor.invoke("getJavaElementMatches", new Class[] { String.class, List.class }, new Object[] { textData, matches });
+	private List getJavaElementMatches(final String textData) {
+		final List matches = new ArrayList();
+		Display.getDefault().syncExec(new Runnable() {
+			public void run() {
+				fAccessor.invoke("getJavaElementMatches", new Class[] { String.class, List.class }, new Object[] { textData, matches });
+			}
+		});
 		return matches;
 	}