nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-13 21:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed tests to use new MPAutotypeKeyPress API

Browse Source
This commit is contained in:
michael starke
2017-01-27 10:49:36 +01:00
parent abf0d11348
commit 43d98b9b38
1 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
MacPassTests/MPTestAutotype.m
View File

@@ -49,28 +49,28 @@
XCTAssertTrue(commands.count == 5); XCTAssertTrue(commands.count == 5);
/* {TAB} */ /* {TAB} */
MPAutotypeKeyPress *keyPress = commands[0]; MPAutotypeKeyPress *keyPress = commands[0];
XCTAssertEqual(keyPress.keyCode, kVK_Tab); XCTAssertEqual(keyPress.key.keyCode, kVK_Tab);
XCTAssertEqual(keyPress.modifierMask, 0); XCTAssertEqual(keyPress.key.modifier, 0);
/* {ENTER} */ /* {ENTER} */
keyPress = commands[1]; keyPress = commands[1];
XCTAssertEqual(keyPress.keyCode, kVK_Return); XCTAssertEqual(keyPress.key.keyCode, kVK_Return);
XCTAssertEqual(keyPress.modifierMask, 0); XCTAssertEqual(keyPress.key.modifier, 0);
/* ~ -> Enter */ /* ~ -> Enter */
keyPress = commands[2]; keyPress = commands[2];
XCTAssertEqual(keyPress.keyCode, kVK_Return); XCTAssertEqual(keyPress.key.keyCode, kVK_Return);
XCTAssertEqual(keyPress.modifierMask, 0); XCTAssertEqual(keyPress.key.modifier, 0);
/* {tAb} */ /* {tAb} */
keyPress = commands[3]; keyPress = commands[3];
XCTAssertEqual(keyPress.keyCode, kVK_Tab); XCTAssertEqual(keyPress.key.keyCode, kVK_Tab);
XCTAssertEqual(keyPress.modifierMask, 0); XCTAssertEqual(keyPress.key.modifier, 0);
/* {ShIfT}{enter}*/ /* {ShIfT}{enter}*/
keyPress = commands[4]; keyPress = commands[4];
XCTAssertEqual(keyPress.keyCode, kVK_Return); XCTAssertEqual(keyPress.key.keyCode, kVK_Return);
XCTAssertEqual(keyPress.modifierMask, kCGEventFlagMaskShift); XCTAssertEqual(keyPress.key.modifier, kCGEventFlagMaskShift);
} }
- (void)testCaseSensitiveCustomAttributeLookup { - (void)testCaseSensitiveCustomAttributeLookup {
@@ -114,43 +114,43 @@
/* {F1} */ /* {F1} */
MPAutotypeKeyPress *key = commands[1]; MPAutotypeKeyPress *key = commands[1];
XCTAssertEqual(key.modifierMask, 0); XCTAssertEqual(key.key.modifier, 0);
XCTAssertEqual(key.keyCode, kVK_F1); XCTAssertEqual(key.key.keyCode, kVK_F1);
/* {F2} */ /* {F2} */
key = commands[2]; key = commands[2];
XCTAssertEqual(key.modifierMask, 0); XCTAssertEqual(key.key.modifier, 0);
XCTAssertEqual(key.keyCode, kVK_F2); XCTAssertEqual(key.key.keyCode, kVK_F2);
/* {F3} */ /* {F3} */
key = commands[3]; key = commands[3];
XCTAssertEqual(key.modifierMask, 0); XCTAssertEqual(key.key.modifier, 0);
XCTAssertEqual(key.keyCode, kVK_F3); XCTAssertEqual(key.key.keyCode, kVK_F3);
/* {F4} */ /* {F4} */
key = commands[4]; key = commands[4];
XCTAssertEqual(key.modifierMask, 0); XCTAssertEqual(key.key.modifier, 0);
XCTAssertEqual(key.keyCode, kVK_F4); XCTAssertEqual(key.key.keyCode, kVK_F4);
/* {F5} */ /* {F5} */
key = commands[5]; key = commands[5];
XCTAssertEqual(key.modifierMask, 0); XCTAssertEqual(key.key.modifier, 0);
XCTAssertEqual(key.keyCode, kVK_F5); XCTAssertEqual(key.key.keyCode, kVK_F5);
/* ^%{F6} */ /* ^%{F6} */
key = commands[6]; key = commands[6];
XCTAssertEqual(key.modifierMask, (kCGEventFlagMaskCommand | kCGEventFlagMaskAlternate)); XCTAssertEqual(key.key.modifier, (kCGEventFlagMaskCommand | kCGEventFlagMaskAlternate));
XCTAssertEqual(key.keyCode, kVK_F6); XCTAssertEqual(key.key.keyCode, kVK_F6);
/* {F7} */ /* {F7} */
key = commands[7]; key = commands[7];
XCTAssertEqual(key.modifierMask, 0); XCTAssertEqual(key.key.modifier, 0);
XCTAssertEqual(key.keyCode, kVK_F7); XCTAssertEqual(key.key.keyCode, kVK_F7);
/* {F19} */ /* {F19} */
key = commands[8]; key = commands[8];
XCTAssertEqual(key.modifierMask, 0); XCTAssertEqual(key.key.modifier, 0);
XCTAssertEqual(key.keyCode, kVK_F19); XCTAssertEqual(key.key.keyCode, kVK_F19);
paste = commands[9]; paste = commands[9];
XCTAssertEqualObjects(paste.pasteData, @"{F20}"); XCTAssertEqualObjects(paste.pasteData, @"{F20}");
@@ -173,8 +173,8 @@
/* {TAB} */ /* {TAB} */
MPAutotypeKeyPress *keyPress = commands[1]; MPAutotypeKeyPress *keyPress = commands[1];
XCTAssertEqual(keyPress.keyCode, kVK_Tab); // Tab is a fixed key, no mapping needed XCTAssertEqual(keyPress.key.keyCode, kVK_Tab); // Tab is a fixed key, no mapping needed
XCTAssertEqual(keyPress.modifierMask, 0); XCTAssertEqual(keyPress.key.modifier, 0);
/* {PASSWORD} */ /* {PASSWORD} */
paste = commands[2]; paste = commands[2];
@@ -182,7 +182,7 @@
/* {ENTER} */ /* {ENTER} */
keyPress = commands[3]; keyPress = commands[3];
XCTAssertEqual(keyPress.keyCode, kVK_Return); XCTAssertEqual(keyPress.key.keyCode, kVK_Return);
/* Command 2 */ /* Command 2 */
context = [[MPAutotypeContext alloc] initWithEntry:self.entry andSequence:@"^T{USERNAME}%+^{TAB}Whoo{PASSWORD}{ENTER}"]; context = [[MPAutotypeContext alloc] initWithEntry:self.entry andSequence:@"^T{USERNAME}%+^{TAB}Whoo{PASSWORD}{ENTER}"];
@@ -196,14 +196,14 @@
/* ^T */ /* ^T */
keyPress = commands[0]; keyPress = commands[0];
/* Lower case is ok, since we only need the key, not the sequence to reproduce the string */ /* lowercase T since we supplied modifiers so the ones needed for Uppercase T will be ignored, instead the "t" key is used */
XCTAssertTrue([@"t" isEqualToString:[MPKeyMapper stringForKey:keyPress.keyCode]]); XCTAssertEqualObjects(@"t", [MPKeyMapper stringForModifiedKey:keyPress.key]);
BOOL useCommandInsteadOfControl = [[NSUserDefaults standardUserDefaults] boolForKey:kMPSettingsKeySendCommandForControlKey]; BOOL useCommandInsteadOfControl = [[NSUserDefaults standardUserDefaults] boolForKey:kMPSettingsKeySendCommandForControlKey];
if(useCommandInsteadOfControl) { if(useCommandInsteadOfControl) {
XCTAssertEqual(keyPress.modifierMask, kCGEventFlagMaskCommand); XCTAssertEqual(keyPress.key.modifier, kCGEventFlagMaskCommand);
} }
else { else {
XCTAssertEqual(keyPress.modifierMask, kCGEventFlagMaskControl); XCTAssertEqual(keyPress.key.modifier, kCGEventFlagMaskControl);
} }
/* {USERNAME} */ /* {USERNAME} */
@@ -212,12 +212,12 @@
/* %+^{TAB} */ /* %+^{TAB} */
keyPress = commands[2]; keyPress = commands[2];
XCTAssertEqual(keyPress.keyCode, kVK_Tab); // Tab is a fixed key, no mapping needed XCTAssertEqual(keyPress.key.keyCode, kVK_Tab); // Tab is a fixed key, no mapping needed
if(useCommandInsteadOfControl) { if(useCommandInsteadOfControl) {
XCTAssertEqual(keyPress.modifierMask, (kCGEventFlagMaskCommand | kCGEventFlagMaskShift | kCGEventFlagMaskAlternate)); XCTAssertEqual(keyPress.key.modifier, (kCGEventFlagMaskCommand | kCGEventFlagMaskShift | kCGEventFlagMaskAlternate));
} }
else { else {
XCTAssertEqual(keyPress.modifierMask, (kCGEventFlagMaskControl | kCGEventFlagMaskShift | kCGEventFlagMaskAlternate)); XCTAssertEqual(keyPress.key.modifier, (kCGEventFlagMaskControl | kCGEventFlagMaskShift | kCGEventFlagMaskAlternate));
} }
/* Whoo{PASSWORD} */ /* Whoo{PASSWORD} */
@@ -227,8 +227,8 @@
/* {ENTER} */ /* {ENTER} */
keyPress = commands[4]; keyPress = commands[4];
XCTAssertEqual(keyPress.keyCode, kVK_Return); XCTAssertEqual(keyPress.key.keyCode, kVK_Return);
XCTAssertEqual(keyPress.modifierMask, 0); XCTAssertEqual(keyPress.key.modifier, 0);
/* Command 3 */ /* Command 3 */
@@ -239,13 +239,13 @@
/*^T*/ /*^T*/
keyPress = commands[0]; keyPress = commands[0];
XCTAssertEqualObjects(@"t", [MPKeyMapper stringForKey:keyPress.keyCode]); XCTAssertEqualObjects(@"t", [MPKeyMapper stringForModifiedKey:keyPress.key]);
/* TODO - Respect user settings? */ /* TODO - Respect user settings? */
if(useCommandInsteadOfControl) { if(useCommandInsteadOfControl) {
XCTAssertEqual(keyPress.modifierMask, kCGEventFlagMaskCommand); XCTAssertEqual(keyPress.key.modifier, kCGEventFlagMaskCommand);
} }
else { else {
XCTAssertEqual(keyPress.modifierMask, kCGEventFlagMaskControl); XCTAssertEqual(keyPress.key.modifier, kCGEventFlagMaskControl);
} }
/*XCTAssertEqual(keyPress.modifierMask, kCGEventFlagMaskControl);*/ /*XCTAssertEqual(keyPress.modifierMask, kCGEventFlagMaskControl);*/