Removed the patch for Bug 90355 on the 3.0.1 maintenance branch.
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/performance/EditorPerformanceSuite.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/performance/EditorPerformanceSuite.java index 62f51f0..da4a0a2 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/performance/EditorPerformanceSuite.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/performance/EditorPerformanceSuite.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2005 IBM Corporation and others. + * Copyright (c) 2004 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 @@ -21,9 +21,8 @@ public static final String [] EDITOR_FILE_EXTENSIONS = {"perf_basic", "perf_outline", "java"}; public static final String [][] EDITOR_SWITCH_PAIRS = { - {"1.perf_outline", "1.java"}, - {"1.perf_basic", "1.perf_outline"}, - {"1.java", "plugin.xml"}}; + {"perf_outline", "java"}, + {"perf_basic", "perf_outline"}}; /** * Returns the suite. This is required to use the JUnit Launcher. @@ -55,7 +54,7 @@ */ private void addSwitchScenarios() { for (int i = 0; i < EDITOR_SWITCH_PAIRS.length; i++) { - addTest(new EditorSwitchTest(EDITOR_SWITCH_PAIRS[i][0], EDITOR_SWITCH_PAIRS[i][1])); + addTest(new EditorSwitchTest(EDITOR_SWITCH_PAIRS[i])); } }
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/performance/EditorSwitchTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/performance/EditorSwitchTest.java index ac7a104..09cfb29 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/performance/EditorSwitchTest.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/performance/EditorSwitchTest.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2004 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 @@ -21,9 +21,9 @@ */ public class EditorSwitchTest extends BasicPerformanceTest { - private String file1; + private String extension1; - private String file2; + private String extension2; /** * Constructor. @@ -33,16 +33,10 @@ */ public EditorSwitchTest(String[] pair) { super("testEditorSwitch:" + pair[0] + "," + pair[1]); - file1 = "1." + pair[0]; - file2 = "2." + pair[1]; + extension1 = pair[0]; + extension2 = pair[1]; } - - public EditorSwitchTest(String file1, String file2) { - super("testEditorSwitch:" + file1 + "," + file2); - this.file1 = file1; - this.file2 = file2; - } - + /** * Test editor opening performance. This test always fails. */ @@ -52,9 +46,9 @@ // the initial time to open, just switching. IWorkbenchWindow window = openTestWindow(UIPerformanceTestSetup.PERSPECTIVE1); final IWorkbenchPage activePage = window.getActivePage(); - final IFile file1 = getProject().getFile(this.file1); + final IFile file1 = getProject().getFile("1." + extension1); assertTrue(file1.exists()); - final IFile file2 = getProject().getFile(this.file2); + final IFile file2 = getProject().getFile("1." + extension2); assertTrue(file2.exists()); IDE.openEditor(activePage, file1, true); IDE.openEditor(activePage, file2, true);
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/performance/UIPerformanceTestSetup.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/performance/UIPerformanceTestSetup.java index e8ff786..0dc51d7 100644 --- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/performance/UIPerformanceTestSetup.java +++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/performance/UIPerformanceTestSetup.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2005 IBM Corporation and others. + * Copyright (c) 2000, 2004 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 @@ -12,8 +12,6 @@ package org.eclipse.ui.tests.performance; import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.net.URL; import junit.extensions.TestSetup; import junit.framework.Test; @@ -23,14 +21,10 @@ import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.tests.TestPlugin; public class UIPerformanceTestSetup extends TestSetup { @@ -106,20 +100,6 @@ for (int i = 0; i < EditorPerformanceSuite.EDITOR_FILE_EXTENSIONS.length; i++) { createFiles(EditorPerformanceSuite.EDITOR_FILE_EXTENSIONS[i]); } - - // Create a plugin.xml file to test the manifest editor - IFile iFile = testProject.getFile("plugin.xml"); - URL file; - try { - file = Platform.asLocalURL(TestPlugin.getDefault() - .getBundle().getEntry("/data/test_editor_inputs/" + "plugin.xml")); - iFile.create(file.openStream(), true, null); - } catch (IOException e) { - throw new CoreException(new Status(IStatus.ERROR, TestPlugin.getDefault() - .getBundle().getSymbolicName(), 0, e.getMessage(), - e)); - } - }
diff --git a/tests/org.eclipse.ui.tests/data/test_editor_inputs/plugin.xml b/tests/org.eclipse.ui.tests/data/test_editor_inputs/plugin.xml deleted file mode 100644 index 066c909..0000000 --- a/tests/org.eclipse.ui.tests/data/test_editor_inputs/plugin.xml +++ /dev/null
@@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<plugin - id="iuieuoe" - name="Iuieuoe Plug-in" - version="1.0.0" - provider-name=""> - - <runtime> - <library name="iuieuoe.jar"> - <export name="*"/> - </library> - </runtime> - -</plugin>