sync with head
diff --git a/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF b/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF index 7ba0896..56148f0 100644 --- a/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)", org.eclipse.jface;bundle-version="[3.5.0,4.0.0)", - org.junit, + org.junit;bundle-version="3.8.2", org.eclipse.text.tests;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)" Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/org.eclipse.search.tests/META-INF/MANIFEST.MF b/org.eclipse.search.tests/META-INF/MANIFEST.MF index 01ce799..f24ae91 100644 --- a/org.eclipse.search.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.search.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.search.tests -Bundle-Version: 3.5.0.qualifier +Bundle-Version: 3.6.0.qualifier Bundle-ClassPath: searchtests.jar Bundle-Activator: org.eclipse.search.tests.SearchTestPlugin Bundle-Vendor: %providerName @@ -13,10 +13,10 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)", - org.eclipse.search;bundle-version="[3.5.0,4.0.0)", + org.eclipse.search;bundle-version="[3.5.100,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)", - org.junit, + org.junit;bundle-version="3.8.2", org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)", org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.editors;bundle-version="[3.5.0,4.0.0)"
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java index d45a2d1..8f7697a 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/core/tests/LongQuery.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -34,7 +34,7 @@ } } fIsRunning= false; - return new Status(IStatus.OK, "some plugin", 0, "No message", null); + return Status.OK_STATUS; } public boolean isRunning() {
diff --git a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java index cd41953..b4c29d9 100644 --- a/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java +++ b/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/FileSearchTests.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -28,17 +28,14 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.ide.IDE; -import org.eclipse.search.ui.text.FileTextSearchScope; - -import org.eclipse.search.internal.core.text.PatternConstructor; -import org.eclipse.search.internal.ui.SearchPlugin; - import org.eclipse.search.core.text.TextSearchEngine; import org.eclipse.search.core.text.TextSearchMatchAccess; import org.eclipse.search.core.text.TextSearchRequestor; import org.eclipse.search.core.text.TextSearchScope; - +import org.eclipse.search.internal.core.text.PatternConstructor; +import org.eclipse.search.internal.ui.SearchPlugin; import org.eclipse.search.tests.ResourceHelper; +import org.eclipse.search.ui.text.FileTextSearchScope; public class FileSearchTests extends TestCase { @@ -242,10 +239,10 @@ IFolder folder1= ResourceHelper.createFolder(fProject.getFolder("folder1")); ResourceHelper.createFile(folder1, "file1", buf.toString()); IFile file2= ResourceHelper.createFile(folder1, "file2", buf.toString()); - file2.setDerived(true); + file2.setDerived(true, null); IFolder folder2= ResourceHelper.createFolder(folder1.getFolder("folder2")); - folder2.setDerived(true); + folder2.setDerived(true, null); ResourceHelper.createFile(folder2, "file3", buf.toString()); IFolder folder3= ResourceHelper.createFolder(folder2.getFolder("folder3"));
diff --git a/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF b/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF index fdc32bb..eab23ba 100644 --- a/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.ui.editors.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Export-Package: org.eclipse.ui.editors.tests Require-Bundle: org.eclipse.core.runtime, - org.junit, + org.junit;bundle-version="3.8.2", org.eclipse.jface;bundle-version="[3.5.0,4.0.0)", org.eclipse.text;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)",
diff --git a/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF b/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF index 723158d..97b8a63 100644 --- a/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.ui.workbench.texteditor.tests/META-INF/MANIFEST.MF
@@ -15,6 +15,6 @@ org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", - org.junit, + org.junit;bundle-version="3.8.2", org.eclipse.text.tests;bundle-version="[3.5.0,4.0.0)" Bundle-RequiredExecutionEnvironment: J2SE-1.4