Added better test for modifier base key presses

2025-12-14 00:02:28 +00:00 · 2014-12-03 14:36:36 +01:00
parent c2985d2faa
commit 7ce789790c
7 changed files with 127 additions and 79 deletions
--- a/MacPassTests/KPKTestAutotype.m
+++ b/MacPassTests/KPKTestAutotype.m
@@ -0,0 +1,115 @@
+//
+//  KPKTestAutotypeNormalization.m
+//  MacPass
+//
+//  Created by Michael Starke on 18.02.14.
+//  Copyright (c) 2014 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import <Carbon/Carbon.h>
+
+#import "NSString+Commands.h"
+#import "MPAutotypeCommand.h"
+#import "MPAutotypeContext.h"
+#import "MPAutotypePaste.h"
+#import "MPAutotypeKeyPress.h"
+
+#import "MPKeyMapper.h"
+
+#import "KPKEntry.h"
+
+@interface KPKTestAutotype : XCTestCase
+
+@end
+
+@implementation KPKTestAutotype
+
+- (void)testSimpleNormalization {
+  NSString *normalized = [@"Whoo %{%}{^}{SHIFT}+ {SPACE}{ENTER}^V%V~T" normalizedAutotypeSequence];
+  XCTAssertTrue([normalized isEqualToString:@"Whoo{SPACE}{ALT}{%}{^}{SHIFT}{SHIFT}{SPACE}{SPACE}{ENTER}{CONTROL}V{ALT}V{ENTER}T"]);
+}
+
+- (void)testCommandRepetition {
+  NSString *normalized = [@"Whoo %{% 2}{^}{SHIFT 5}+ {SPACE}{ENTER}^V%V~T" normalizedAutotypeSequence];
+  XCTAssertTrue([normalized isEqualToString:@"Whoo{SPACE}{ALT}{%}{%}{^}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SPACE}{SPACE}{ENTER}{CONTROL}V{ALT}V{ENTER}T"]);
+  normalized = [@"{TAB 5}TAB{TAB}{SHIFT}{SHIFT 10}ENTER{ENTER}{%%}" normalizedAutotypeSequence];
+  XCTAssertTrue([normalized isEqualToString:@"{TAB}{TAB}{TAB}{TAB}{TAB}TAB{TAB}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}ENTER{ENTER}{%%}"]);
+}
+
+- (void)testeBracketValidation {
+  XCTAssertFalse([@"{BOOO}NO-COMMAND{TAB}{WHOO}{WHOO}{SPACE}!!!thisIsFun{{MISMATCH!!!}" validateCommmand]);
+  XCTAssertFalse([@"{{}}}}" validateCommmand]);
+  XCTAssertFalse([@"{}{}{{{}{{{{{{}}" validateCommmand]);
+  XCTAssertTrue([@"{}{}{}{}{}{      }ThisIsValid{}{STOP}" validateCommmand]);
+}
+
+- (void)testCommandCreation {
+  KPKEntry *entry = [[KPKEntry alloc] init];
+  entry.title = @"Title";
+  entry.url = @"www.myurl.com";
+  entry.username = @"{{User{name}}}";
+  entry.password = @"Pass{word}";
+
+  /* Command 1 */
+  MPAutotypeContext *context = [[MPAutotypeContext alloc] initWithEntry:entry andSequence:@"{USERNAME}{TAB}{PASSWORD}{ENTER}"];
+  NSArray *commands = [MPAutotypeCommand commandsForContext:context];
+  
+  XCTAssertTrue(commands.count == 4);
+  XCTAssertTrue([commands[0] isKindOfClass:[MPAutotypePaste class]]);
+  XCTAssertTrue([commands[1] isKindOfClass:[MPAutotypeKeyPress class]]);
+  XCTAssertTrue([commands[2] isKindOfClass:[MPAutotypePaste class]]);
+  XCTAssertTrue([commands[3] isKindOfClass:[MPAutotypeKeyPress class]]);
+  
+  /* {USERNAME} */
+  MPAutotypePaste *paste = commands[0];
+  XCTAssertTrue([paste.pasteData isEqualToString:entry.username]);
+
+  /* {TAB} */
+  MPAutotypeKeyPress *keyPress = commands[1];
+  XCTAssertTrue(keyPress.keyCode == kVK_Tab); // Tab is a fixed key, no mapping needed
+  XCTAssertTrue(keyPress.modifierMask == 0);
+  
+  /* {PASSWORD} */
+  paste = commands[2];
+  XCTAssertTrue([entry.password isEqualToString:paste.pasteData]);
+  
+  /* {ENTER} */
+  keyPress = commands[3];
+  XCTAssertTrue(keyPress.keyCode = kVK_Return);
+  
+  /* Command 2 */
+  context = [[MPAutotypeContext alloc] initWithEntry:entry andSequence:@"^T{USERNAME}%+^{TAB}Whoo{PASSWORD}{ENTER}"];
+  commands = [MPAutotypeCommand commandsForContext:context];
+  XCTAssertTrue(commands.count == 5);
+  XCTAssertTrue([commands[0] isKindOfClass:[MPAutotypeKeyPress class]]);
+  XCTAssertTrue([commands[1] isKindOfClass:[MPAutotypePaste class]]);
+  XCTAssertTrue([commands[2] isKindOfClass:[MPAutotypeKeyPress class]]);
+  XCTAssertTrue([commands[3] isKindOfClass:[MPAutotypePaste class]]);
+  XCTAssertTrue([commands[4] isKindOfClass:[MPAutotypeKeyPress class]]);
+  
+  /* ^T */
+  keyPress = commands[0];
+  /* Lower case is ok, since we only need the key, not the sequence to reproduce the string */
+  XCTAssertTrue([@"t" isEqualToString:[MPKeyMapper stringForKey:keyPress.keyCode]]);
+  XCTAssertTrue(keyPress.modifierMask == kCGEventFlagMaskCommand);
+
+  /* {USERNAME} */
+  paste = commands[1];
+  XCTAssertTrue([paste.pasteData isEqualToString:entry.username]);
+  
+  /* %+^{TAB} */
+  keyPress = commands[2];
+  XCTAssertTrue(keyPress.keyCode == kVK_Tab); // Tab is a fixed key, no mapping needed
+  XCTAssertTrue(keyPress.modifierMask = kCGEventFlagMaskCommand | kCGEventFlagMaskAlphaShift | kCGEventFlagMaskAlternate);
+  
+  /* Whoo{PASSWORD} */
+  paste = commands[3];
+  NSString *pasteString = [[NSString alloc] initWithFormat:@"%@%@", @"Whoo", entry.password];
+  XCTAssertTrue([pasteString isEqualToString:paste.pasteData]);
+  
+  /* {ENTER} */
+  keyPress = commands[4];
+  XCTAssertTrue(keyPress.keyCode = kVK_Return);
+}
+@end
--- a/MacPassTests/KPKTestAutotypeNormalization.m
+++ b/MacPassTests/KPKTestAutotypeNormalization.m
@@ -1,68 +0,0 @@
-//
-//  KPKTestAutotypeNormalization.m
-//  MacPass
-//
-//  Created by Michael Starke on 18.02.14.
-//  Copyright (c) 2014 HicknHack Software GmbH. All rights reserved.
-//
-
-#import <XCTest/XCTest.h>
-#import "NSString+Commands.h"
-#import "MPAutotypeCommand.h"
-#import "MPAutotypeContext.h"
-#import "MPAutotypePaste.h"
-#import "MPAutotypeKeyPress.h"
-
-#import "KPKEntry.h"
-
-@interface KPKTestAutotypeNormalization : XCTestCase
-
-@end
-
-@implementation KPKTestAutotypeNormalization
-
- (void)testSimpleNormalization {
-  NSString *normalized = [@"Whoo %{%}{^}{SHIFT}+ {SPACE}{ENTER}^V%V~T" normalizedAutotypeSequence];
-  XCTAssertTrue([normalized isEqualToString:@"Whoo{SPACE}{ALT}{%}{^}{SHIFT}{SHIFT}{SPACE}{SPACE}{ENTER}{CONTROL}V{ALT}V{ENTER}T"]);
-}
-
- (void)testCommandRepetition {
-  NSString *normalized = [@"Whoo %{% 2}{^}{SHIFT 5}+ {SPACE}{ENTER}^V%V~T" normalizedAutotypeSequence];
-  XCTAssertTrue([normalized isEqualToString:@"Whoo{SPACE}{ALT}{%}{%}{^}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SPACE}{SPACE}{ENTER}{CONTROL}V{ALT}V{ENTER}T"]);
-  normalized = [@"{TAB 5}TAB{TAB}{SHIFT}{SHIFT 10}ENTER{ENTER}{%%}" normalizedAutotypeSequence];
-  XCTAssertTrue([normalized isEqualToString:@"{TAB}{TAB}{TAB}{TAB}{TAB}TAB{TAB}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}ENTER{ENTER}{%%}"]);
-}
-
- (void)testeBracketValidation {
-  XCTAssertFalse([@"{BOOO}NO-COMMAND{TAB}{WHOO}{WHOO}{SPACE}!!!thisIsFun{{MISMATCH!!!}" validateCommmand]);
-  XCTAssertFalse([@"{{}}}}" validateCommmand]);
-  XCTAssertFalse([@"{}{}{{{}{{{{{{}}" validateCommmand]); 
-  XCTAssertTrue([@"{}{}{}{}{}{      }ThisIsValid{}{STOP}" validateCommmand]);
-}
-
- (void)testCommandCreation {
-  KPKEntry *entry = [[KPKEntry alloc] init];
-  entry.title = @"Title";
-  entry.url = @"www.myurl.com";
-  entry.username = @"{{User{name}}}";
-  entry.password = @"Pass{word}";
-  
-  MPAutotypeContext *context = [[MPAutotypeContext alloc] initWithEntry:entry andSequence:@"{USERNAME}{TAB}{PASSWORD}{ENTER}"];
-  NSArray *commands = [MPAutotypeCommand commandsForContext:context];
-  
-  XCTAssert([commands count] == 4);
-  XCTAssert([commands[0] isKindOfClass:[MPAutotypePaste class]]);
-  XCTAssert([commands[1] isKindOfClass:[MPAutotypeKeyPress class]]);
-  XCTAssert([commands[2] isKindOfClass:[MPAutotypePaste class]]);
-  XCTAssert([commands[3] isKindOfClass:[MPAutotypeKeyPress class]]);
-  
-  context = [[MPAutotypeContext alloc] initWithEntry:entry andSequence:@"{DELAY=5}{VKEY-NX 1}{VKEY-EX 200}{DELAY 5}{VKEY 300}"];
-  commands = [MPAutotypeCommand commandsForContext:context];
-  
-  context = [[MPAutotypeContext alloc] initWithEntry:entry andSequence:@"^T{USERNAME}%+^{TAB}Whoo{PASSWORD}{ENTER}"];
-  commands = [MPAutotypeCommand commandsForContext:context];
-  
-  
-  //XCTAssert([commands count] == 5);
-}
-@end