Merge pull request #2815 from jarthana/BETA_JAVA26

Merge master into BETA_JAVA26

Author: jarthana

org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AssistQuickFixTest.java

@@ -53,6 +53,7 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
 
+import org.eclipse.jdt.internal.core.JavaModelManager;
 import org.eclipse.jdt.internal.core.manipulation.CodeTemplateContextType;
 import org.eclipse.jdt.internal.core.manipulation.StubUtility;
 import org.eclipse.jdt.internal.corext.fix.FixMessages;
@@ -106,6 +107,7 @@ public void setUp() throws Exception {
 		fJProject1= projectSetup.getProject();
 
 		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
+		JavaModelManager.getIndexManager().waitForIndex(false, null);
 	}