add new binding table test for context sensitive comparator

Author: ghentschke

bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.e4.ui.bindings;singleton:=true
-Bundle-Version: 0.14.600.qualifier
+Bundle-Version: 0.14.700.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

tests/org.eclipse.e4.ui.bindings.tests/src/org/eclipse/e4/ui/bindings/tests/BindingTableTests.java

@@ -82,7 +82,7 @@ public class BindingTableTests {
 			"M1+X", ID_WINDOW, PASTE_ID, "M1+V", ID_WINDOW, REFRESH_ID, "F5",
 			ID_DIALOG_AND_WINDOW, EXIT_ID, "CTRL+Q", ID_DIALOG_AND_WINDOW,
 			ABOUT_ID, "CTRL+5 A", ID_DIALOG_AND_WINDOW, TAG_ID, "ALT+/",
-			ID_TEXT, RENAME_ID, "F2", ID_WINDOW, SHOW_TOOLTIP_ID, "F2",
+			ID_TEXT, RENAME_ID, "F2", ID_WINDOW, RENAME_ID, "M2+M3+R", ID_TEXT, SHOW_TOOLTIP_ID, "F2",
 			ID_TEXT, CORR_INDENT_ID, "CTRL+I", ID_JAVA, INDENT_LINE_ID,
 			"CTRL+I", ID_JS, PASTE_ID, "SHIFT+Insert", ID_WINDOW, PASTE_ID,
 			"CTRL+5 V", ID_TEXT, };
@@ -317,6 +317,30 @@ public void testManagerLookupShortcut() throws Exception {
 		assertEquals(paste, match);
 	}
 
+	@Test
+	public void testManagerLookupShortcutDeeperContext() throws Exception {
+		BindingTableManager manager = createManager();
+		// Given a BindingTableManager with default active scheme and context manager:
+		manager.setActiveSchemes(new String[] { "org.eclipse.ui.defaultAcceleratorConfiguration" }, contextManager);
+		Binding paste = getTestBinding(RENAME_ID, ID_TEXT);
+		assertNotNull(paste);
+
+		ArrayList<Context> window = new ArrayList<>();
+		Context winContext = contextManager.getContext(ID_WINDOW);
+		Context dawContext = contextManager.getContext(ID_TEXT);
+		window.add(winContext);
+		window.add(dawContext);
+		ContextSet windowSet = manager.createContextSet(window);
+		// When getting the best sequence for the paste command:
+		Binding match = manager.getBestSequenceFor(windowSet, paste.getParameterizedCommand());
+		// Then the paste binding with the ID_TEXT context should be returned, because
+		// it's more specific than the ID_WINDOW context:
+		assertEquals(paste, match);
+
+		// disable context manager in BindingComparator for other tests:
+		manager.setActiveSchemes(null, null);
+	}
+
 	@Test
 	public void testManagerLookupShortcutLongChain() throws Exception {
 		BindingTableManager manager = createManager();
@@ -387,6 +411,16 @@ private Binding getTestBinding(String commandId) {
 		return null;
 	}
 
+	private Binding getTestBinding(String commandId, String contextId) {
+		for (Binding binding : loadedBindings) {
+			if (commandId.equals(binding.getParameterizedCommand().getId())
+					&& contextId.equals(binding.getContextId())) {
+				return binding;
+			}
+		}
+		return null;
+	}
+
 	private void assertContextSet(ContextSet set, String[] contextIds) {
 		List<Context> contexts = set.getContexts();
 		assertEquals(contextIds.length, contexts.size(), contexts.toString());