Skip to content

Commit

Permalink
JBIDE-20932 Fix KeyBindingsTest errors on Mac OS X
Browse files Browse the repository at this point in the history 
Fix check for OS and use appropriate key code for mac

Conflicts:
	tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/editor/test/commands/KeyBindingsTest.java
  • Loading branch information
@dgolovin
dgolovin committed Oct 10, 2015
1 parent cb2bec3 commit 50d6b9f
Showing 1 changed file with 64 additions and 49 deletions.
113 changes: 64 additions & 49 deletions ....jst.web.ui.test/src/org/jboss/tools/jst/web/ui/editor/test/commands/KeyBindingsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import java.util.List;

import org.eclipse.core.commands.ParameterizedCommand;
import org.eclipse.core.runtime.Platform;
import org.eclipse.e4.core.commands.internal.HandlerServiceImpl;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.bindings.EBindingService;
Expand All @@ -38,29 +39,29 @@
public class KeyBindingsTest extends ContentAssistantTestCase {
private static final String PROJECT_NAME = "Jbide6061Test"; //$NON-NLS-1$
private static final String PAGE_NAMES[] = {
"/WebContent/pages/xhtml_page.xhtml", //$NON-NLS-1$
"/WebContent/pages/jsp_page.jsp" //$NON-NLS-1$
"/WebContent/pages/xhtml_page.xhtml", //$NON-NLS-1$
"/WebContent/pages/jsp_page.jsp" //$NON-NLS-1$
};

class KeyCombination {
int mask;
int key;

public KeyCombination(int mask, int key) {
this.mask = mask;
this.key = key;
}
}

public static final int CTRL_KEY = Platform.OS_MACOSX.equals(Platform.getOS()) ? SWT.COMMAND : SWT.CTRL;

KeyCombination[] keys = new KeyCombination[] {
new KeyCombination(SWT.CTRL, 'd'),
new KeyCombination(SWT.CTRL | SWT.ALT, 16777217),
new KeyCombination(SWT.CTRL | SWT.ALT, 16777218),
new KeyCombination(SWT.ALT, 16777217),
new KeyCombination(SWT.ALT, 16777218)
};


new KeyCombination(CTRL_KEY, 'd'),
new KeyCombination(CTRL_KEY | SWT.ALT, 0x1000001), // Arrow UP
new KeyCombination(CTRL_KEY | SWT.ALT, 0x1000002), // Arrow Down
new KeyCombination(SWT.ALT, 0x1000001),
new KeyCombination(SWT.ALT, 0x1000002) };

public void setUp() throws Exception {
project = ProjectImportTestSetup.loadProject(PROJECT_NAME);
}
Expand All @@ -70,22 +71,23 @@ public void testKeyBindings () {
doTestKeyBindingsOnPage(pageName);
}
}

private void doTestKeyBindingsOnPage(String pageName) {
openEditor(pageName);
try {
PartSite partSite = (PartSite)(editorPart.getEditorSite() instanceof PartSite ? editorPart.getEditorSite() : null);
openEditor(pageName);
try {
PartSite partSite = (PartSite) (editorPart.getEditorSite() instanceof PartSite ? editorPart.getEditorSite()
: null);
assertNotNull("Cannot get PartSite instance for " + pageName, partSite);
IEclipseContext context = partSite.getContext();
IEclipseContext context = partSite.getContext();
assertNotNull("Cannot get EclipseContext instance for " + pageName, context);
EBindingService bindingService = (EBindingService) context.get(EBindingService.class.getName());
EBindingService bindingService = (EBindingService) context.get(EBindingService.class.getName());
assertNotNull("Cannot get BindingService instance for " + pageName, bindingService);

for (KeyCombination key : keys) {
for (KeyCombination key : keys) {
Event event = createKeyCombinationEvent(key.mask, key.key);

List<KeyStroke> keyStrokes = KeyBindingDispatcher.generatePossibleKeyStrokes(event);

boolean found = false;
KeySequence sequenceBeforeKeyStroke = KeySequence.getInstance();
for (Iterator<KeyStroke> iterator = keyStrokes.iterator(); iterator.hasNext();) {
Expand All @@ -94,58 +96,71 @@ private void doTestKeyBindingsOnPage(String pageName) {
if (isPerfectMatch(bindingService, sequenceAfterKeyStroke)) {
final ParameterizedCommand cmd = getPerfectMatch(bindingService, sequenceAfterKeyStroke);
assertNotNull("Command not found for 'Perfect Match' keystroke " + sequenceAfterKeyStroke, cmd);
assertNotNull("Command found but cannot be executed for 'Perfect Match' keystroke " + sequenceAfterKeyStroke, HandlerServiceImpl.lookUpHandler(context, cmd.getId()));
assertNotNull(
"Command found but cannot be executed for 'Perfect Match' keystroke "
+ sequenceAfterKeyStroke,
HandlerServiceImpl.lookUpHandler(context, cmd.getId()));
found = true;
break;
}
}
assertTrue("Command not found for key combination " + key.mask + "/" + key.key, found);
}
} finally {
closeEditor();
}
}
} finally {
closeEditor();
}
}

// stateMask is one or combination of following: SWT.ALT, SWT.SHIFT, SWT.CONTROL, SWT.BUTTON1, SWT.BUTTON2, SWT.BUTTON3
// keyval is the key value ('A' ... 'Z', 'a' ... 'z','0' ... '9' and so on

// stateMask is one or combination of following: SWT.ALT, SWT.SHIFT,
// SWT.CONTROL, SWT.BUTTON1, SWT.BUTTON2, SWT.BUTTON3
// keyval is the key value ('A' ... 'Z', 'a' ... 'z','0' ... '9' and so on
private static int TICK_TIMER = 1;

private Event createKeyCombinationEvent(int mask, int keyval) {
Event event = new Event ();
Event event = new Event();
event.time = TICK_TIMER++;
event.keyCode = keyval;
int key = keyval;
if ('a' <= key && key <= 'z') key -= 'a' - 'A';
if (64 <= key && key <= 95) key -= 64;
if ('a' <= key && key <= 'z')
key -= 'a' - 'A';
if (64 <= key && key <= 95)
key -= 64;
event.character = (char) key;
event.keyLocation = 0;
if ((mask & SWT.ALT) != 0) event.stateMask |= SWT.ALT;
if ((mask & SWT.SHIFT) != 0) event.stateMask |= SWT.SHIFT;
if ((mask & SWT.CONTROL) != 0) event.stateMask |= SWT.CONTROL;
if ((mask & SWT.BUTTON1) != 0) event.stateMask |= SWT.BUTTON1;
if ((mask & SWT.BUTTON2) != 0) event.stateMask |= SWT.BUTTON2;
if ((mask & SWT.BUTTON3) != 0) event.stateMask |= SWT.BUTTON3;

if ((mask & SWT.ALT) != 0)
event.stateMask |= SWT.ALT;
if ((mask & SWT.SHIFT) != 0)
event.stateMask |= SWT.SHIFT;
if ((mask & SWT.CONTROL) != 0)
event.stateMask |= SWT.CONTROL;
if ((mask & SWT.COMMAND) != 0)
event.stateMask |= SWT.COMMAND;
if ((mask & SWT.BUTTON1) != 0)
event.stateMask |= SWT.BUTTON1;
if ((mask & SWT.BUTTON2) != 0)
event.stateMask |= SWT.BUTTON2;
if ((mask & SWT.BUTTON3) != 0)
event.stateMask |= SWT.BUTTON3;

return event;
}
boolean isPerfectMatch(EBindingService bindingService, KeySequence keySequence) {
}

boolean isPerfectMatch(EBindingService bindingService, KeySequence keySequence) {
return bindingService.isPerfectMatch(keySequence);
}
}

private ParameterizedCommand getPerfectMatch(EBindingService bindingService, KeySequence keySequence) {
private ParameterizedCommand getPerfectMatch(EBindingService bindingService, KeySequence keySequence) {
Binding perfectMatch = bindingService.getPerfectMatch(keySequence);
return perfectMatch == null ? null : perfectMatch.getParameterizedCommand();
}


static boolean emulateSendEvent(Widget widget, int type, Event event) throws Exception {
static boolean emulateSendEvent(Widget widget, int type, Event event) throws Exception {
Method m = Widget.class.getMethod("sendEvent", int.class, Event.class);
m.setAccessible(true);
Object result = m.invoke(widget, type, event);
if (result instanceof Boolean) {
return ((Boolean)result);
return ((Boolean) result);
}
return false;
}
}
}

0 comments on commit 50d6b9f

Please sign in to comment.