Attachment #150011 for bug #193600

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




import java.lang.reflect.Field;

import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.GroupMarker;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.ToolBarManager;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.IPageLayout;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbenchCommandConstants;
import org.eclipse.ui.menus.AbstractContributionFactory;
import org.eclipse.ui.menus.CommandContributionItem;
import org.eclipse.ui.menus.CommandContributionItemParameter;
import org.eclipse.ui.menus.IContributionRoot;
import org.eclipse.ui.menus.IMenuService;
import org.eclipse.ui.services.IServiceLocator;

	public static final String ID_DEFAULT = "org.eclipse.ui.tests.menus.iconsDefault";
	public static final String ID_ALL = "org.eclipse.ui.tests.menus.iconsAll";
	public static final String ID_TOOLBAR = "org.eclipse.ui.tests.menus.iconsToolbarOnly";
	private AbstractContributionFactory afterOne;
	private AbstractContributionFactory beforeOne;
	private AbstractContributionFactory endofOne;
	private CommandContributionItem usefulContribution;

	/**
	 * @param testName


	public void testFactoryScopePopulation() throws Exception {
		AbstractContributionFactory factory = new AbstractContributionFactory(
				"menu:the.population.menu?after=additions",
				"org.eclipse.ui.tests") {

			public void createContributionItems(IServiceLocator serviceLocator,
					IContributionRoot additions) {

		assertNotNull(view);
		IMenuService service = (IMenuService) view.getSite().getService(
				IMenuService.class);
		service.populateContributionManager(testManager,
				"menu:the.population.menu");
		assertEquals(0, testManager.getSize());
		service.addContributionFactory(factory);
		assertEquals(1, testManager.getSize());

		processEvents();
		assertEquals(0, testManager.getSize());
	}

	public void testAfterQueryInvalid() throws Exception {
		MenuManager manager = new MenuManager();
		menuService.populateContributionManager(manager, "menu:after.menu");
		assertEquals(0, manager.getSize());
	}

	public void testAfterQueryOneGroup() throws Exception {
		MenuManager manager = new MenuManager();
		manager.add(new GroupMarker("after.one"));
		assertEquals(1, manager.getSize());
		menuService.populateContributionManager(manager, "menu:after.menu");
		assertEquals(2, manager.getSize());
		assertEquals("after.insert", manager.getItems()[1].getId());
	}

	public void testAfterQueryTwoGroups() throws Exception {
		MenuManager manager = new MenuManager();
		manager.add(new GroupMarker("after.one"));
		manager.add(new GroupMarker("after.two"));
		assertEquals(2, manager.getSize());
		menuService.populateContributionManager(manager, "menu:after.menu");
		assertEquals(3, manager.getSize());
		assertEquals("after.insert", manager.getItems()[1].getId());
	}

	public void testBeforeQueryInvalid() throws Exception {
		MenuManager manager = new MenuManager();
		menuService.populateContributionManager(manager, "menu:before.menu");
		assertEquals(0, manager.getSize());
	}

	public void testBeforeQueryOneGroup() throws Exception {
		MenuManager manager = new MenuManager();
		manager.add(new GroupMarker("before.one"));
		assertEquals(1, manager.getSize());
		menuService.populateContributionManager(manager, "menu:before.menu");
		assertEquals(2, manager.getSize());
		assertEquals("before.insert", manager.getItems()[0].getId());
	}

	public void testBeforeQueryTwoGroups() throws Exception {
		MenuManager manager = new MenuManager();
		manager.add(new GroupMarker("before.one"));
		manager.add(new GroupMarker("before.two"));
		assertEquals(2, manager.getSize());
		menuService.populateContributionManager(manager, "menu:before.menu");
		assertEquals(3, manager.getSize());
		assertEquals("before.insert", manager.getItems()[0].getId());
	}

	public void testBeforeQueryTwoGroups2() throws Exception {
		MenuManager manager = new MenuManager();
		manager.add(new GroupMarker("before.two"));
		manager.add(new GroupMarker("before.one"));
		assertEquals(2, manager.getSize());
		menuService.populateContributionManager(manager, "menu:before.menu");
		assertEquals(3, manager.getSize());
		assertEquals("before.insert", manager.getItems()[1].getId());
	}

	public void testEndofQueryInvalid() throws Exception {
		MenuManager manager = new MenuManager();
		menuService.populateContributionManager(manager, "menu:endof.menu");
		assertEquals(0, manager.getSize());
	}

	public void testEndofQueryOneGroup() throws Exception {
		MenuManager manager = new MenuManager();
		manager.add(new GroupMarker("endof.one"));
		assertEquals(1, manager.getSize());
		menuService.populateContributionManager(manager, "menu:endof.menu");
		assertEquals(2, manager.getSize());
		assertEquals("endof.insert", manager.getItems()[1].getId());
	}

	public void testEndofQueryTwoGroups() throws Exception {
		MenuManager manager = new MenuManager();
		manager.add(new GroupMarker("endof.one"));
		manager.add(new GroupMarker("endof.two"));
		assertEquals(2, manager.getSize());
		menuService.populateContributionManager(manager, "menu:endof.menu");
		assertEquals(3, manager.getSize());
		assertEquals("endof.insert", manager.getItems()[1].getId());
	}

	public void testEndofQueryTwoGroups2() throws Exception {
		MenuManager manager = new MenuManager();
		manager.add(new GroupMarker("endof.one"));
		manager.add(usefulContribution);
		manager.add(new GroupMarker("endof.two"));
		assertEquals(3, manager.getSize());
		menuService.populateContributionManager(manager, "menu:endof.menu");
		assertEquals(4, manager.getSize());
		assertEquals("endof.insert", manager.getItems()[2].getId());
	}

	public void testEndofQueryTwoGroups3() throws Exception {
		MenuManager manager = new MenuManager();
		manager.add(new GroupMarker("endof.two"));
		manager.add(new GroupMarker("endof.one"));
		assertEquals(2, manager.getSize());
		menuService.populateContributionManager(manager, "menu:endof.menu");
		assertEquals(3, manager.getSize());
		assertEquals("endof.insert", manager.getItems()[2].getId());
	}

	public void testEndofQueryTwoGroups4() throws Exception {
		MenuManager manager = new MenuManager();
		manager.add(new GroupMarker("endof.two"));
		manager.add(new GroupMarker("endof.one"));
		manager.add(usefulContribution);
		assertEquals(3, manager.getSize());
		menuService.populateContributionManager(manager, "menu:endof.menu");
		assertEquals(4, manager.getSize());
		assertEquals("endof.insert", manager.getItems()[3].getId());
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.ui.tests.menus.MenuTestCase#doSetUp()
	 */
	protected void doSetUp() throws Exception {
		super.doSetUp();
		afterOne = new AbstractContributionFactory(
				"menu:after.menu?after=after.one", "org.eclipse.ui.tests") {
			public void createContributionItems(IServiceLocator serviceLocator,
					IContributionRoot additions) {
				additions.addContributionItem(new GroupMarker("after.insert"),
						null);
			}
		};
		menuService.addContributionFactory(afterOne);

		beforeOne = new AbstractContributionFactory(
				"menu:before.menu?before=before.one", "org.eclipse.ui.tests") {
			public void createContributionItems(IServiceLocator serviceLocator,
					IContributionRoot additions) {
				additions.addContributionItem(new GroupMarker("before.insert"),
						null);
			}
		};
		menuService.addContributionFactory(beforeOne);

		endofOne = new AbstractContributionFactory(
				"menu:endof.menu?endof=endof.one", "org.eclipse.ui.tests") {
			public void createContributionItems(IServiceLocator serviceLocator,
					IContributionRoot additions) {
				additions.addContributionItem(new GroupMarker("endof.insert"),
						null);
			}
		};
		menuService.addContributionFactory(endofOne);
		usefulContribution = new CommandContributionItem(
				new CommandContributionItemParameter(window, null,
						IWorkbenchCommandConstants.HELP_ABOUT, 0));
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.ui.tests.menus.MenuTestCase#doTearDown()
	 */
	protected void doTearDown() throws Exception {
		menuService.removeContributionFactory(afterOne);
		menuService.removeContributionFactory(beforeOne);
		menuService.removeContributionFactory(endofOne);
		usefulContribution.dispose();
		usefulContribution = null;
		super.doTearDown();
	}
}




import java.util.List;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.expressions.Expression;
import org.eclipse.core.expressions.IEvaluationContext;
import org.eclipse.core.runtime.IConfigurationElement;

import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.ISourceProvider;
import org.eclipse.ui.IWorkbenchActionConstants;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.activities.ActivityManagerEvent;

import org.eclipse.ui.internal.util.Util;
import org.eclipse.ui.keys.IBindingService;
import org.eclipse.ui.menus.AbstractContributionFactory;
import org.eclipse.ui.menus.MenuUtil;
import org.eclipse.ui.services.IEvaluationReference;
import org.eclipse.ui.services.IEvaluationService;
import org.eclipse.ui.services.IServiceLocator;

 */
public final class WorkbenchMenuService extends InternalMenuService {

	private static final String INDEX_AFTER_ADDITIONS = "after=additions"; //$NON-NLS-1$

	/**
	 * A combined property and activity listener that updates the visibility of
	 * contribution items in the new menu system.

		}
	}

	/**
	 * @param mgr
	 * @param uri
	 * @return
	 */
	private int getInsertionIndex(ContributionManager mgr, String location) {
		MenuLocationURI uri = new MenuLocationURI(location);
		String query = uri.getQuery();


		// No Query means 'after=additions' (if ther) or
		// the end of the menu
		if (query.length() == 0 || query.equals(INDEX_AFTER_ADDITIONS)) {
			additionsIndex = mgr
					.indexOf(IWorkbenchActionConstants.MB_ADDITIONS);
			if (additionsIndex == -1)
				additionsIndex = mgr.getItems().length;
			else
				++additionsIndex;
		} else {
			// Should be in the form "[before|after|endof]=id"
			String[] queryParts = Util.split(query, '=');
			if (queryParts.length>1 && queryParts[1].length() > 0) {
				String modifier = queryParts[0];
				String id = queryParts[1];
				additionsIndex = mgr.indexOf(id);
				if (additionsIndex != -1) {
					if (MenuUtil.QUERY_BEFORE.equals(modifier)) {
						// this is OK, the additionsIndex will either be correct
						// or -1 (which is a no-op)
					} else if (MenuUtil.QUERY_AFTER.equals(modifier)) {
						additionsIndex++;
					} else if (MenuUtil.QUERY_ENDOF.equals(modifier)) {
						// OK, this one is exciting
						IContributionItem[] items = mgr.getItems();
						for (additionsIndex++; additionsIndex < items.length; additionsIndex++) {
							if (items[additionsIndex].isGroupMarker()) {
								break;
							}
						}
					}
				}
			}
		}





	public final static String TRIM_STATUS = "toolbar:org.eclipse.ui.trim.status"; //$NON-NLS-1$

	/**
	 * Valid query attribute. Usage <b>menu:menu.id?before=contribution.id</b>.
	 * 
	 * @since 3.6
	 */
	public final static String QUERY_BEFORE = "before"; //$NON-NLS-1$

	/**
	 * Valid query attribute. Usage <b>menu:menu.id?after=contribution.id</b>.
	 * 
	 * @since 3.6
	 */
	public final static String QUERY_AFTER = "after"; //$NON-NLS-1$

	/**
	 * Valid query attribute. Usage <b>menu:menu.id?endof=contribution.id</b>.
	 * <p>
	 * This menu contribution will be placed at the end of the group defined by
	 * <b>contribution.id</b> (usually right in front of the next group marker
	 * or separator). Further contribution processing can still place other
	 * contributions after this one.
	 * </p>
	 * 
	 * @since 3.6
	 */
	public final static String QUERY_ENDOF = "endof"; //$NON-NLS-1$

	/**
	 * Contributions of targets to this location will be included with the show
	 * in menu.
	 * 

Return to bug 193600

Lines 19-25 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/menus/WorkbenchMenuService.java (-12 / +27 lines)
19	import java.util.List;	19	import java.util.List;
20	import java.util.Map;	20	import java.util.Map;
21	import java.util.Set;	21	import java.util.Set;
22
23	import org.eclipse.core.expressions.Expression;	22	import org.eclipse.core.expressions.Expression;
24	import org.eclipse.core.expressions.IEvaluationContext;	23	import org.eclipse.core.expressions.IEvaluationContext;
25	import org.eclipse.core.runtime.IConfigurationElement;	24	import org.eclipse.core.runtime.IConfigurationElement;
Lines 48-53 Link Here
48	import org.eclipse.swt.widgets.Control;	47	import org.eclipse.swt.widgets.Control;
49	import org.eclipse.swt.widgets.Display;	48	import org.eclipse.swt.widgets.Display;
50	import org.eclipse.ui.ISourceProvider;	49	import org.eclipse.ui.ISourceProvider;
		50	import org.eclipse.ui.IWorkbenchActionConstants;
51	import org.eclipse.ui.IWorkbenchWindow;	51	import org.eclipse.ui.IWorkbenchWindow;
52	import org.eclipse.ui.PlatformUI;	52	import org.eclipse.ui.PlatformUI;
53	import org.eclipse.ui.activities.ActivityManagerEvent;	53	import org.eclipse.ui.activities.ActivityManagerEvent;
Lines 73-78 Link Here
73	import org.eclipse.ui.internal.util.Util;	73	import org.eclipse.ui.internal.util.Util;
74	import org.eclipse.ui.keys.IBindingService;	74	import org.eclipse.ui.keys.IBindingService;
75	import org.eclipse.ui.menus.AbstractContributionFactory;	75	import org.eclipse.ui.menus.AbstractContributionFactory;
		76	import org.eclipse.ui.menus.MenuUtil;
76	import org.eclipse.ui.services.IEvaluationReference;	77	import org.eclipse.ui.services.IEvaluationReference;
77	import org.eclipse.ui.services.IEvaluationService;	78	import org.eclipse.ui.services.IEvaluationService;
78	import org.eclipse.ui.services.IServiceLocator;	79	import org.eclipse.ui.services.IServiceLocator;
Lines 91-96 Link Here
91	*/	92	*/
92	public final class WorkbenchMenuService extends InternalMenuService {	93	public final class WorkbenchMenuService extends InternalMenuService {
93		94
		95	private static final String INDEX_AFTER_ADDITIONS = "after=additions"; //$NON-NLS-1$
		96
94	/**	97	/**
95	* A combined property and activity listener that updates the visibility of	98	* A combined property and activity listener that updates the visibility of
96	* contribution items in the new menu system.	99	* contribution items in the new menu system.
Lines 736-746 Link Here
736	}	739	}
737	}	740	}
738		741
739	/**
740	* @param mgr
741	* @param uri
742	* @return
743	*/
744	private int getInsertionIndex(ContributionManager mgr, String location) {	742	private int getInsertionIndex(ContributionManager mgr, String location) {
745	MenuLocationURI uri = new MenuLocationURI(location);	743	MenuLocationURI uri = new MenuLocationURI(location);
746	String query = uri.getQuery();	744	String query = uri.getQuery();
Lines 749-767 Link Here
749		747
750	// No Query means 'after=additions' (if ther) or	748	// No Query means 'after=additions' (if ther) or
751	// the end of the menu	749	// the end of the menu
752	if (query.length() == 0 \|\| query.equals("after=additions")) { //$NON-NLS-1$	750	if (query.length() == 0 \|\| query.equals(INDEX_AFTER_ADDITIONS)) {
753	additionsIndex = mgr.indexOf("additions"); //$NON-NLS-1$	751	additionsIndex = mgr
		752	.indexOf(IWorkbenchActionConstants.MB_ADDITIONS);
754	if (additionsIndex == -1)	753	if (additionsIndex == -1)
755	additionsIndex = mgr.getItems().length;	754	additionsIndex = mgr.getItems().length;
756	else	755	else
757	++additionsIndex;	756	++additionsIndex;
758	} else {	757	} else {
759	// Should be in the form "[before\|after]=id"	758	// Should be in the form "[before\|after\|endof]=id"
760	String[] queryParts = Util.split(query, '=');	759	String[] queryParts = Util.split(query, '=');
761	if (queryParts.length>1 && queryParts[1].length() > 0) {	760	if (queryParts.length>1 && queryParts[1].length() > 0) {
762	additionsIndex = mgr.indexOf(queryParts[1]);	761	String modifier = queryParts[0];
763	if (additionsIndex != -1 && queryParts[0].equals("after")) //$NON-NLS-1$	762	String id = queryParts[1];
764	additionsIndex++;	763	additionsIndex = mgr.indexOf(id);
		764	if (additionsIndex != -1) {
		765	if (MenuUtil.QUERY_BEFORE.equals(modifier)) {
		766	// this is OK, the additionsIndex will either be correct
		767	// or -1 (which is a no-op)
		768	} else if (MenuUtil.QUERY_AFTER.equals(modifier)) {
		769	additionsIndex++;
		770	} else if (MenuUtil.QUERY_ENDOF.equals(modifier)) {
		771	// OK, this one is exciting
		772	IContributionItem[] items = mgr.getItems();
		773	for (additionsIndex++; additionsIndex < items.length; additionsIndex++) {
		774	if (items[additionsIndex].isGroupMarker()) {
		775	break;
		776	}
		777	}
		778	}
		779	}
765	}	780	}
766	}	781	}
767		782

Lines 39-44 Link Here

(-)Eclipse UI/org/eclipse/ui/menus/MenuUtil.java (+27 lines)
39	public final static String TRIM_STATUS = "toolbar:org.eclipse.ui.trim.status"; //$NON-NLS-1$	39	public final static String TRIM_STATUS = "toolbar:org.eclipse.ui.trim.status"; //$NON-NLS-1$
40		40
41	/**	41	/**
		42	* Valid query attribute. Usage <b>menu:menu.id?before=contribution.id</b>.
		43	*
		44	* @since 3.6
		45	*/
		46	public final static String QUERY_BEFORE = "before"; //$NON-NLS-1$
		47
		48	/**
		49	* Valid query attribute. Usage <b>menu:menu.id?after=contribution.id</b>.
		50	*
		51	* @since 3.6
		52	*/
		53	public final static String QUERY_AFTER = "after"; //$NON-NLS-1$
		54
		55	/**
		56	* Valid query attribute. Usage <b>menu:menu.id?endof=contribution.id</b>.
		57	* <p>
		58	* This menu contribution will be placed at the end of the group defined by
		59	* <b>contribution.id</b> (usually right in front of the next group marker
		60	* or separator). Further contribution processing can still place other
		61	* contributions after this one.
		62	* </p>
		63	*
		64	* @since 3.6
		65	*/
		66	public final static String QUERY_ENDOF = "endof"; //$NON-NLS-1$
		67
		68	/**
42	* Contributions of targets to this location will be included with the show	69	* Contributions of targets to this location will be included with the show
43	* in menu.	70	* in menu.
44	*	71	*

Lines 14-27 Link Here

(-)Eclipse UI Tests/org/eclipse/ui/tests/menus/MenuPopulationTest.java (-2 / +183 lines)
14	import java.lang.reflect.Field;	14	import java.lang.reflect.Field;
15		15
16	import org.eclipse.jface.action.Action;	16	import org.eclipse.jface.action.Action;
		17	import org.eclipse.jface.action.GroupMarker;
17	import org.eclipse.jface.action.IContributionItem;	18	import org.eclipse.jface.action.IContributionItem;
18	import org.eclipse.jface.action.MenuManager;	19	import org.eclipse.jface.action.MenuManager;
19	import org.eclipse.jface.action.ToolBarManager;	20	import org.eclipse.jface.action.ToolBarManager;
20	import org.eclipse.jface.resource.ImageDescriptor;	21	import org.eclipse.jface.resource.ImageDescriptor;
21	import org.eclipse.ui.IPageLayout;	22	import org.eclipse.ui.IPageLayout;
22	import org.eclipse.ui.IViewPart;	23	import org.eclipse.ui.IViewPart;
		24	import org.eclipse.ui.IWorkbenchCommandConstants;
23	import org.eclipse.ui.menus.AbstractContributionFactory;	25	import org.eclipse.ui.menus.AbstractContributionFactory;
24	import org.eclipse.ui.menus.CommandContributionItem;	26	import org.eclipse.ui.menus.CommandContributionItem;
		27	import org.eclipse.ui.menus.CommandContributionItemParameter;
25	import org.eclipse.ui.menus.IContributionRoot;	28	import org.eclipse.ui.menus.IContributionRoot;
26	import org.eclipse.ui.menus.IMenuService;	29	import org.eclipse.ui.menus.IMenuService;
27	import org.eclipse.ui.services.IServiceLocator;	30	import org.eclipse.ui.services.IServiceLocator;
Lines 41-46 Link Here
41	public static final String ID_DEFAULT = "org.eclipse.ui.tests.menus.iconsDefault";	44	public static final String ID_DEFAULT = "org.eclipse.ui.tests.menus.iconsDefault";
42	public static final String ID_ALL = "org.eclipse.ui.tests.menus.iconsAll";	45	public static final String ID_ALL = "org.eclipse.ui.tests.menus.iconsAll";
43	public static final String ID_TOOLBAR = "org.eclipse.ui.tests.menus.iconsToolbarOnly";	46	public static final String ID_TOOLBAR = "org.eclipse.ui.tests.menus.iconsToolbarOnly";
		47	private AbstractContributionFactory afterOne;
		48	private AbstractContributionFactory beforeOne;
		49	private AbstractContributionFactory endofOne;
		50	private CommandContributionItem usefulContribution;
44		51
45	/**	52	/**
46	* @param testName	53	* @param testName
Lines 161-167 Link Here
161		168
162	public void testFactoryScopePopulation() throws Exception {	169	public void testFactoryScopePopulation() throws Exception {
163	AbstractContributionFactory factory = new AbstractContributionFactory(	170	AbstractContributionFactory factory = new AbstractContributionFactory(
164	"menu:the.population.menu?after=additions", "org.eclipse.ui.tests") {	171	"menu:the.population.menu?after=additions",
		172	"org.eclipse.ui.tests") {
165		173
166	public void createContributionItems(IServiceLocator serviceLocator,	174	public void createContributionItems(IServiceLocator serviceLocator,
167	IContributionRoot additions) {	175	IContributionRoot additions) {
Lines 178-184 Link Here
178	assertNotNull(view);	186	assertNotNull(view);
179	IMenuService service = (IMenuService) view.getSite().getService(	187	IMenuService service = (IMenuService) view.getSite().getService(
180	IMenuService.class);	188	IMenuService.class);
181	service.populateContributionManager(testManager, "menu:the.population.menu");	189	service.populateContributionManager(testManager,
		190	"menu:the.population.menu");
182	assertEquals(0, testManager.getSize());	191	assertEquals(0, testManager.getSize());
183	service.addContributionFactory(factory);	192	service.addContributionFactory(factory);
184	assertEquals(1, testManager.getSize());	193	assertEquals(1, testManager.getSize());
Lines 186-189 Link Here
186	processEvents();	195	processEvents();
187	assertEquals(0, testManager.getSize());	196	assertEquals(0, testManager.getSize());
188	}	197	}
		198
		199	public void testAfterQueryInvalid() throws Exception {
		200	MenuManager manager = new MenuManager();
		201	menuService.populateContributionManager(manager, "menu:after.menu");
		202	assertEquals(0, manager.getSize());
		203	}
		204
		205	public void testAfterQueryOneGroup() throws Exception {
		206	MenuManager manager = new MenuManager();
		207	manager.add(new GroupMarker("after.one"));
		208	assertEquals(1, manager.getSize());
		209	menuService.populateContributionManager(manager, "menu:after.menu");
		210	assertEquals(2, manager.getSize());
		211	assertEquals("after.insert", manager.getItems()[1].getId());
		212	}
		213
		214	public void testAfterQueryTwoGroups() throws Exception {
		215	MenuManager manager = new MenuManager();
		216	manager.add(new GroupMarker("after.one"));
		217	manager.add(new GroupMarker("after.two"));
		218	assertEquals(2, manager.getSize());
		219	menuService.populateContributionManager(manager, "menu:after.menu");
		220	assertEquals(3, manager.getSize());
		221	assertEquals("after.insert", manager.getItems()[1].getId());
		222	}
		223
		224	public void testBeforeQueryInvalid() throws Exception {
		225	MenuManager manager = new MenuManager();
		226	menuService.populateContributionManager(manager, "menu:before.menu");
		227	assertEquals(0, manager.getSize());
		228	}
		229
		230	public void testBeforeQueryOneGroup() throws Exception {
		231	MenuManager manager = new MenuManager();
		232	manager.add(new GroupMarker("before.one"));
		233	assertEquals(1, manager.getSize());
		234	menuService.populateContributionManager(manager, "menu:before.menu");
		235	assertEquals(2, manager.getSize());
		236	assertEquals("before.insert", manager.getItems()[0].getId());
		237	}
		238
		239	public void testBeforeQueryTwoGroups() throws Exception {
		240	MenuManager manager = new MenuManager();
		241	manager.add(new GroupMarker("before.one"));
		242	manager.add(new GroupMarker("before.two"));
		243	assertEquals(2, manager.getSize());
		244	menuService.populateContributionManager(manager, "menu:before.menu");
		245	assertEquals(3, manager.getSize());
		246	assertEquals("before.insert", manager.getItems()[0].getId());
		247	}
		248
		249	public void testBeforeQueryTwoGroups2() throws Exception {
		250	MenuManager manager = new MenuManager();
		251	manager.add(new GroupMarker("before.two"));
		252	manager.add(new GroupMarker("before.one"));
		253	assertEquals(2, manager.getSize());
		254	menuService.populateContributionManager(manager, "menu:before.menu");
		255	assertEquals(3, manager.getSize());
		256	assertEquals("before.insert", manager.getItems()[1].getId());
		257	}
		258
		259	public void testEndofQueryInvalid() throws Exception {
		260	MenuManager manager = new MenuManager();
		261	menuService.populateContributionManager(manager, "menu:endof.menu");
262	assertEquals(0, manager.getSize());
263	}
264
265	public void testEndofQueryOneGroup() throws Exception {
266	MenuManager manager = new MenuManager();
267	manager.add(new GroupMarker("endof.one"));
268	assertEquals(1, manager.getSize());
269	menuService.populateContributionManager(manager, "menu:endof.menu");
270	assertEquals(2, manager.getSize());
271	assertEquals("endof.insert", manager.getItems()[1].getId());
272	}
273
274	public void testEndofQueryTwoGroups() throws Exception {
275	MenuManager manager = new MenuManager();
276	manager.add(new GroupMarker("endof.one"));
277	manager.add(new GroupMarker("endof.two"));
278	assertEquals(2, manager.getSize());
279	menuService.populateContributionManager(manager, "menu:endof.menu");
280	assertEquals(3, manager.getSize());
281	assertEquals("endof.insert", manager.getItems()[1].getId());
282	}
283
284	public void testEndofQueryTwoGroups2() throws Exception {
285	MenuManager manager = new MenuManager();
286	manager.add(new GroupMarker("endof.one"));
287	manager.add(usefulContribution);
288	manager.add(new GroupMarker("endof.two"));
289	assertEquals(3, manager.getSize());
290	menuService.populateContributionManager(manager, "menu:endof.menu");
291	assertEquals(4, manager.getSize());
292	assertEquals("endof.insert", manager.getItems()[2].getId());
293	}
294
295	public void testEndofQueryTwoGroups3() throws Exception {
296	MenuManager manager = new MenuManager();
297	manager.add(new GroupMarker("endof.two"));
298	manager.add(new GroupMarker("endof.one"));
299	assertEquals(2, manager.getSize());
300	menuService.populateContributionManager(manager, "menu:endof.menu");
301	assertEquals(3, manager.getSize());
302	assertEquals("endof.insert", manager.getItems()[2].getId());
303	}
304
305	public void testEndofQueryTwoGroups4() throws Exception {
306	MenuManager manager = new MenuManager();
307	manager.add(new GroupMarker("endof.two"));
308	manager.add(new GroupMarker("endof.one"));
309	manager.add(usefulContribution);
310	assertEquals(3, manager.getSize());
311	menuService.populateContributionManager(manager, "menu:endof.menu");
312	assertEquals(4, manager.getSize());
313	assertEquals("endof.insert", manager.getItems()[3].getId());
314	}
315
316	/*
317	* (non-Javadoc)
318	*
319	* @see org.eclipse.ui.tests.menus.MenuTestCase#doSetUp()
320	*/
321	protected void doSetUp() throws Exception {
322	super.doSetUp();
323	afterOne = new AbstractContributionFactory(
324	"menu:after.menu?after=after.one", "org.eclipse.ui.tests") {
325	public void createContributionItems(IServiceLocator serviceLocator,
326	IContributionRoot additions) {
327	additions.addContributionItem(new GroupMarker("after.insert"),
328	null);
329	}
330	};
331	menuService.addContributionFactory(afterOne);
332
333	beforeOne = new AbstractContributionFactory(
334	"menu:before.menu?before=before.one", "org.eclipse.ui.tests") {
335	public void createContributionItems(IServiceLocator serviceLocator,
336	IContributionRoot additions) {
337	additions.addContributionItem(new GroupMarker("before.insert"),
338	null);
339	}
340	};
341	menuService.addContributionFactory(beforeOne);
342
343	endofOne = new AbstractContributionFactory(
344	"menu:endof.menu?endof=endof.one", "org.eclipse.ui.tests") {
345	public void createContributionItems(IServiceLocator serviceLocator,
346	IContributionRoot additions) {
347	additions.addContributionItem(new GroupMarker("endof.insert"),
348	null);
349	}
350	};
351	menuService.addContributionFactory(endofOne);
352	usefulContribution = new CommandContributionItem(
353	new CommandContributionItemParameter(window, null,
354	IWorkbenchCommandConstants.HELP_ABOUT, 0));
355	}
356
357	/*
358	* (non-Javadoc)
359	*
360	* @see org.eclipse.ui.tests.menus.MenuTestCase#doTearDown()
361	*/
362	protected void doTearDown() throws Exception {
363	menuService.removeContributionFactory(afterOne);
364	menuService.removeContributionFactory(beforeOne);
365	menuService.removeContributionFactory(endofOne);
366	usefulContribution.dispose();
367	usefulContribution = null;
368	super.doTearDown();
369	}
189	}	370	}