Attachment 26121 Details for Bug 96129 – Minor update to the 3.2 MultiEditor tests v2

[patch] Minor update to the 3.2 MultiEditor tests v2

bug96129-ui.tests-HEAD2.txt (text/plain), 13.49 KB, created by Paul Webster

on 2005-08-15 15:24:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Webster

Created: 2005-08-15 15:24:39 EDT

Size: 13.49 KB

patch

obsolete

>Index: plugin.xml
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.tests/plugin.xml,v
>retrieving revision 1.141
>diff -u -r1.141 plugin.xml
>--- plugin.xml	4 Aug 2005 19:45:31 -0000	1.141
>+++ plugin.xml	15 Aug 2005 19:22:58 -0000
>@@ -598,6 +598,20 @@
>             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">
>@@ -2079,20 +2093,6 @@
>             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">
>Index: Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java,v
>retrieving revision 1.45
>diff -u -r1.45 UiTestSuite.java
>--- Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java	4 May 2005 16:45:57 -0000	1.45
>+++ Eclipse UI Tests/org/eclipse/ui/tests/UiTestSuite.java	15 Aug 2005 19:22:58 -0000
>@@ -31,6 +31,7 @@
> import org.eclipse.ui.tests.keys.KeysTestSuite;
> import org.eclipse.ui.tests.leaks.LeakTests;
> import org.eclipse.ui.tests.menus.MenusTestSuite;
>+import org.eclipse.ui.tests.multieditor.MultiEditorTestSuite;
> import org.eclipse.ui.tests.multipageeditor.MultiPageEditorTestSuite;
> import org.eclipse.ui.tests.navigator.NavigatorTestSuite;
> import org.eclipse.ui.tests.operations.OperationsTestSuite;
>@@ -84,5 +85,6 @@
>         addTest(new TestSuite(LeakTests.class));
>         addTest(new ConcurrencyTestSuite());
>         addTest(new OperationsTestSuite());
>+        addTest(new MultiEditorTestSuite());
>     }
> }
>Index: Eclipse UI Tests/org/eclipse/ui/tests/dnd/DetachedWindowDragTest.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dnd/DetachedWindowDragTest.java,v
>retrieving revision 1.1
>diff -u -r1.1 DetachedWindowDragTest.java
>--- Eclipse UI Tests/org/eclipse/ui/tests/dnd/DetachedWindowDragTest.java	12 Jul 2005 07:44:26 -0000	1.1
>+++ Eclipse UI Tests/org/eclipse/ui/tests/dnd/DetachedWindowDragTest.java	15 Aug 2005 19:22:58 -0000
>@@ -11,6 +11,7 @@
> package org.eclipse.ui.tests.dnd;
> 
> import org.eclipse.ui.IViewPart;
>+import org.eclipse.ui.IViewReference;
> import org.eclipse.ui.internal.dnd.TestDropLocation;
> import org.eclipse.ui.tests.autotests.AbstractTestLogger;
> 
>@@ -55,4 +56,20 @@
>     	viewPart = page.showView(DragDropPerspectiveFactory.dropViewId3); 
>         DragOperations.drag(viewPart, new DetachedDropTarget(), false);
>     }
>+
>+	protected void doTearDown() throws Exception {
>+		// hide detached views so they don't scare any following tests
>+		
>+		IViewReference view = page.findViewReference(DragDropPerspectiveFactory.dropViewId1);
>+		page.attachView(view);
>+//		page.hideView(view.getView(false));
>+		view = page.findViewReference(DragDropPerspectiveFactory.dropViewId2);
>+		page.attachView(view);
>+//		page.hideView(view.getView(false));
>+		view = page.findViewReference(DragDropPerspectiveFactory.dropViewId3);
>+		page.attachView(view);
>+//		page.hideView(view.getView(false));
>+		
>+		super.doTearDown();
>+	}
> }
>Index: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTest.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTest.java,v
>retrieving revision 1.1
>diff -u -r1.1 MultiEditorTest.java
>--- Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTest.java	7 Jul 2005 20:51:00 -0000	1.1
>+++ Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTest.java	15 Aug 2005 19:22:58 -0000
>@@ -1,3 +1,13 @@
>+/*******************************************************************************
>+ * 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;
>@@ -74,19 +84,18 @@
> 	private static String[] gEditorOpenTrace = { "setInitializationData",
> 			"init", "createPartControl", "createInnerPartControl",
> 			"createInnerPartControl", "setFocus", "updateGradient",
>-			"updateGradient", "updateGradient", };
>+			"updateGradient", };
> 
> 	private static String[] gEditorFocusTrace = { "setInitializationData",
> 			"init", "createPartControl", "createInnerPartControl",
> 			"createInnerPartControl", "setFocus", "updateGradient",
>-			"updateGradient", "updateGradient", "setFocus", "updateGradient",
>-			"updateGradient", "updateGradient", };
>+			"updateGradient", "updateGradient", "updateGradient", };
> 
> 	private static String[] gEditorCloseTrace = { "setInitializationData",
> 			"init", "createPartControl", "createInnerPartControl",
> 			"createInnerPartControl", "setFocus", "updateGradient",
>-			"updateGradient", "updateGradient", "setFocus", "updateGradient",
>-			"updateGradient", "updateGradient", "widgetsDisposed", "dispose" };
>+			"updateGradient", "updateGradient", "updateGradient",
>+			"widgetsDisposed", "dispose" };
> 
> 	public static TestSuite suite() {
> 		return new TestSuite(MultiEditorTest.class);
>@@ -159,6 +168,7 @@
> 		// 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));
>@@ -170,6 +180,7 @@
> 
> 		chewUpEvents();
> 
>+		// ((TiledEditor) multiEditor).callHistory.printToConsole();
> 		assertTrue("Editor setFocus trace was incorrect",
> 				((TiledEditor) multiEditor).callHistory
> 						.verifyOrder(gEditorFocusTrace));
>@@ -178,6 +189,7 @@
> 
> 		chewUpEvents();
> 
>+		// ((TiledEditor) multiEditor).callHistory.printToConsole();
> 		assertTrue("Editor close trace was incorrect",
> 				((TiledEditor) multiEditor).callHistory
> 						.verifyOrder(gEditorCloseTrace));
>@@ -305,6 +317,7 @@
> 	 * @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);
>@@ -542,12 +555,14 @@
> 	}
> 
> 	/**
>-	 * Close any editors at the end of a test, so the next test can be clean.
>+	 * Close any editors at the beginner of a test, so the test can be clean.
> 	 */
>-	protected void doTearDown() throws Exception {
>-		fWorkbench.getActiveWorkbenchWindow().getActivePage().closeAllEditors(
>-				false);
>-		super.doTearDown();
>+	protected void doSetUp() throws Exception {
>+		super.doSetUp();
>+		IWorkbenchPage page = fWorkbench.getActiveWorkbenchWindow()
>+				.getActivePage();
>+		page.closeAllEditors(false);
>+
> 	}
> 
> 	/**
>Index: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TestActionBarContributor.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TestActionBarContributor.java,v
>retrieving revision 1.1
>diff -u -r1.1 TestActionBarContributor.java
>--- Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TestActionBarContributor.java	7 Jul 2005 20:51:00 -0000	1.1
>+++ Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TestActionBarContributor.java	15 Aug 2005 19:22:58 -0000
>@@ -1,3 +1,13 @@
>+/*******************************************************************************
>+ * 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;
>Index: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TestEditor.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TestEditor.java,v
>retrieving revision 1.1
>diff -u -r1.1 TestEditor.java
>--- Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TestEditor.java	7 Jul 2005 20:51:00 -0000	1.1
>+++ Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TestEditor.java	15 Aug 2005 19:22:58 -0000
>@@ -1,3 +1,13 @@
>+/*******************************************************************************
>+ * 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;
>Index: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TiledEditor.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TiledEditor.java,v
>retrieving revision 1.1
>diff -u -r1.1 TiledEditor.java
>--- Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TiledEditor.java	7 Jul 2005 20:51:00 -0000	1.1
>+++ Eclipse UI Tests/org/eclipse/ui/tests/multieditor/TiledEditor.java	15 Aug 2005 19:22:58 -0000
>@@ -1,7 +1,13 @@
>-/*
>- * (c) Copyright 2001 MyCorporation.
>- * All Rights Reserved.
>- */
>+/*******************************************************************************
>+ * 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.IConfigurationElement;
>Index: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTestSuite.java
>===================================================================
>RCS file: Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTestSuite.java
>diff -N Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTestSuite.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ Eclipse UI Tests/org/eclipse/ui/tests/multieditor/MultiEditorTestSuite.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,27 @@
>+/*******************************************************************************
>+ * 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);
>+    }
>+}

Actions: View | Diff

Attachments on bug 96129: 22644 | 22931 | 23457 | 24032 | 24096 | 24227 | 24358 | 24437 | 25128 | 25262 | 25425 | 25426 | 25620 | 25735 | 25831 | 25832 | 25834 | 25890 | 25923 | 25936 | 25937 | 25990 | 26109 | 26111 | 26121