Attachment #26111 for bug #96129

View | Details | Raw Unified | Return to bug 96129 | Differences between

and this patch




            name="org.eclipse.ui.tests.contentType2Editor">
         <contentTypeBinding contentTypeId="org.eclipse.ui.tests.content-type2"/>
      </editor>
      <editor
            class="org.eclipse.ui.tests.multieditor.TiledEditor"
            default="false"
            icon="icons/editor.gif"
            id="org.eclipse.ui.tests.multieditor.TiledEditor"
            name="%Editors.TiledEditor"/>
      <editor
            class="org.eclipse.ui.tests.multieditor.TestEditor"
            contributorClass="org.eclipse.ui.tests.multieditor.TestActionBarContributor"
            default="false"
            extensions="etest"
            icon="icons/binary_co.gif"
            id="org.eclipse.ui.tests.multieditor.TestEditor"
            name="%Editors.TestEditor"/>
   </extension>
   <extension
         point="org.eclipse.ui.actionSets">

            name="Editor w/Outline"
            id="org.eclipse.ui.tests.perf_outline"
            extensions="perf_outline"/>
      <editor
            class="org.eclipse.ui.tests.multieditor.TiledEditor"
            default="false"
            icon="icons/editor.gif"
            id="org.eclipse.ui.tests.multieditor.TiledEditor"
            name="%Editors.TiledEditor"/>
      <editor
            class="org.eclipse.ui.tests.multieditor.TestEditor"
            contributorClass="org.eclipse.ui.tests.multieditor.TestActionBarContributor"
            default="false"
            extensions="etest"
            icon="icons/binary_co.gif"
            id="org.eclipse.ui.tests.multieditor.TestEditor"
            name="%Editors.TestEditor"/>    
   </extension>
   <extension
         point="org.eclipse.ui.perspectives">

Lines 31-36 Link Here

(-)Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java (+2 lines)
31	import org.eclipse.ui.tests.keys.KeysTestSuite;	31	import org.eclipse.ui.tests.keys.KeysTestSuite;
32	import org.eclipse.ui.tests.leaks.LeakTests;	32	import org.eclipse.ui.tests.leaks.LeakTests;
33	import org.eclipse.ui.tests.menus.MenusTestSuite;	33	import org.eclipse.ui.tests.menus.MenusTestSuite;
		34	import org.eclipse.ui.tests.multieditor.MultiEditorTestSuite;
34	import org.eclipse.ui.tests.multipageeditor.MultiPageEditorTestSuite;	35	import org.eclipse.ui.tests.multipageeditor.MultiPageEditorTestSuite;
35	import org.eclipse.ui.tests.navigator.NavigatorTestSuite;	36	import org.eclipse.ui.tests.navigator.NavigatorTestSuite;
36	import org.eclipse.ui.tests.operations.OperationsTestSuite;	37	import org.eclipse.ui.tests.operations.OperationsTestSuite;
Lines 84-88 Link Here
84	addTest(new TestSuite(LeakTests.class));	85	addTest(new TestSuite(LeakTests.class));
85	addTest(new ConcurrencyTestSuite());	86	addTest(new ConcurrencyTestSuite());
86	addTest(new OperationsTestSuite());	87	addTest(new OperationsTestSuite());
		88	addTest(new MultiEditorTestSuite());
87	}	89	}
88	}	90	}




/*******************************************************************************
 * Copyright (c) 2000, 2005 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.ui.tests.multieditor;

import java.io.IOException;

	private static String[] gEditorOpenTrace = { "setInitializationData",
			"init", "createPartControl", "createInnerPartControl",
			"createInnerPartControl", "setFocus", "updateGradient",
			"updateGradient", };

	private static String[] gEditorFocusTrace = { "setInitializationData",
			"init", "createPartControl", "createInnerPartControl",
			"createInnerPartControl", "setFocus", "updateGradient",
			"updateGradient",  "updateGradient",
			"updateGradient",  };

	private static String[] gEditorCloseTrace = { "setInitializationData",
			"init", "createPartControl", "createInnerPartControl",
			"createInnerPartControl", "setFocus", "updateGradient",
			"updateGradient",  "updateGradient",
			"updateGradient",  "widgetsDisposed", "dispose" };

	public static TestSuite suite() {
		return new TestSuite(MultiEditorTest.class);

		// listHistory(((TiledEditor) multiEditor).callHistory);

		// check the public API called for opening the TiledEditor
//		((TiledEditor) multiEditor).callHistory.printToConsole();
		assertTrue("The editor open trace was incorrect",
				((TiledEditor) multiEditor).callHistory
						.verifyOrder(gEditorOpenTrace));


		chewUpEvents();

//		((TiledEditor) multiEditor).callHistory.printToConsole();
		assertTrue("Editor setFocus trace was incorrect",
				((TiledEditor) multiEditor).callHistory
						.verifyOrder(gEditorFocusTrace));


		chewUpEvents();

//		((TiledEditor) multiEditor).callHistory.printToConsole();
		assertTrue("Editor close trace was incorrect",
				((TiledEditor) multiEditor).callHistory
						.verifyOrder(gEditorCloseTrace));

	 * @return the IContributionItem for the test editor cool bar.
	 */
	private IContributionItem findMyCoolBar(WorkbenchPage page) {
		//listItems(page);
		IContributionItem contribution = ((IActionBars2) page.getActionBars())
				.getCoolBarManager().find(TESTEDITOR_COOLBAR);
		// assertNotNull(contribution);




/*******************************************************************************
 * Copyright (c) 2000, 2005 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.ui.tests.multieditor;

import org.eclipse.jface.action.ICoolBarManager;




/*******************************************************************************
 * Copyright (c) 2000, 2005 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.ui.tests.multieditor;

import org.eclipse.core.runtime.IProgressMonitor;

Lines 1-7 Link Here

(-)Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TiledEditor.java (-4 / +10 lines)
1	/*	1	/*******************************************************************************
2	* (c) Copyright 2001 MyCorporation.	2	* Copyright (c) 2000, 2005 IBM Corporation and others.
3	* All Rights Reserved.	3	* All rights reserved. This program and the accompanying materials
4	*/	4	* are made available under the terms of the Eclipse Public License v1.0
		5	* which accompanies this distribution, and is available at
		6	* http://www.eclipse.org/legal/epl-v10.html
		7	*
		8	* Contributors:
		9	* IBM Corporation - initial API and implementation
		10	*******************************************************************************/
5	package org.eclipse.ui.tests.multieditor;	11	package org.eclipse.ui.tests.multieditor;
6		12
7	import org.eclipse.core.runtime.IConfigurationElement;	13	import org.eclipse.core.runtime.IConfigurationElement;




/*******************************************************************************
 * Copyright (c) 2000, 2005 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.ui.tests.multieditor;

import junit.framework.Test;
import junit.framework.TestSuite;

public class MultiEditorTestSuite extends TestSuite {

	public static Test suite() {
		return new MultiEditorTestSuite();
	}
    /**
     * Construct the test suite.
     */
    public MultiEditorTestSuite() {
        addTestSuite(MultiEditorTest.class);
    }
}

Return to bug 96129

Lines 598-603 Link Here

(-)plugin.xml (-14 / +14 lines)
598	name="org.eclipse.ui.tests.contentType2Editor">	598	name="org.eclipse.ui.tests.contentType2Editor">
599	<contentTypeBinding contentTypeId="org.eclipse.ui.tests.content-type2"/>	599	<contentTypeBinding contentTypeId="org.eclipse.ui.tests.content-type2"/>
600	</editor>	600	</editor>
		601	<editor
		602	class="org.eclipse.ui.tests.multieditor.TiledEditor"
		603	default="false"
		604	icon="icons/editor.gif"
		605	id="org.eclipse.ui.tests.multieditor.TiledEditor"
		606	name="%Editors.TiledEditor"/>
		607	<editor
		608	class="org.eclipse.ui.tests.multieditor.TestEditor"
		609	contributorClass="org.eclipse.ui.tests.multieditor.TestActionBarContributor"
		610	default="false"
		611	extensions="etest"
		612	icon="icons/binary_co.gif"
		613	id="org.eclipse.ui.tests.multieditor.TestEditor"
		614	name="%Editors.TestEditor"/>
601	</extension>	615	</extension>
602	<extension	616	<extension
603	point="org.eclipse.ui.actionSets">	617	point="org.eclipse.ui.actionSets">
Lines 2079-2098 Link Here
2079	name="Editor w/Outline"	2093	name="Editor w/Outline"
2080	id="org.eclipse.ui.tests.perf_outline"	2094	id="org.eclipse.ui.tests.perf_outline"
2081	extensions="perf_outline"/>	2095	extensions="perf_outline"/>
2082	<editor
2083	class="org.eclipse.ui.tests.multieditor.TiledEditor"
2084	default="false"
2085	icon="icons/editor.gif"
2086	id="org.eclipse.ui.tests.multieditor.TiledEditor"
2087	name="%Editors.TiledEditor"/>
2088	<editor
2089	class="org.eclipse.ui.tests.multieditor.TestEditor"
2090	contributorClass="org.eclipse.ui.tests.multieditor.TestActionBarContributor"
2091	default="false"
2092	extensions="etest"
2093	icon="icons/binary_co.gif"
2094	id="org.eclipse.ui.tests.multieditor.TestEditor"
2095	name="%Editors.TestEditor"/>
2096	</extension>	2096	</extension>
2097	<extension	2097	<extension
2098	point="org.eclipse.ui.perspectives">	2098	point="org.eclipse.ui.perspectives">

Added Link Here

(-)Eclipse (+27 lines)
1	/*******************************************************************************
2	* Copyright (c) 2000, 2005 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.ui.tests.multieditor;
12
13	import junit.framework.Test;
14	import junit.framework.TestSuite;
15
16	public class MultiEditorTestSuite extends TestSuite {
17
18	public static Test suite() {
19	return new MultiEditorTestSuite();
20	}
21	/**
22	* Construct the test suite.
23	*/
24	public MultiEditorTestSuite() {
25	addTestSuite(MultiEditorTest.class);
26	}
27	}