From 84cd196d541230012afcc9f79d3aeaea45563162 Mon Sep 17 00:00:00 2001 From: michael starke Date: Wed, 19 Feb 2014 17:44:34 +0100 Subject: [PATCH] Normalization now can expand repeated keystrokes --- MacPass/MPAutotypeContext.m | 2 +- MacPassTests/KPKTestAutotypeNormalization.m | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/MacPass/MPAutotypeContext.m b/MacPass/MPAutotypeContext.m index 0e920a72..98ee3fed 100644 --- a/MacPass/MPAutotypeContext.m +++ b/MacPass/MPAutotypeContext.m @@ -28,7 +28,7 @@ - (instancetype)initWithEntry:(KPKEntry *)entry andSequence:(NSString *)sequence { self = [super init]; if(self) { - _command = [[sequence normalizedCommand] copy]; + _command = [[sequence normalizedAutotypeSequence] copy]; _entry = entry; } return self; diff --git a/MacPassTests/KPKTestAutotypeNormalization.m b/MacPassTests/KPKTestAutotypeNormalization.m index 7621662c..c7678af3 100644 --- a/MacPassTests/KPKTestAutotypeNormalization.m +++ b/MacPassTests/KPKTestAutotypeNormalization.m @@ -15,9 +15,17 @@ @implementation KPKTestAutotypeNormalization -- (void)testNormalization { - NSString *normalized = [@"Whoo %{%}{^}{SHIFT}+ {SPACE}{ENTER}^V%V~T" normalizedCommand]; - XCTAssertTrue([normalized isEqualToString:@"Whoo{SPACE}{ALT}{%}{^}{SHIFT}{SHIFT}{SPACE}{SPACE}{ENTER}{CONTROL}V{ALT}V{ENTER}T"], @"Normalization shoudl resutl in supplied string"); +- (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(@"{TAB}{TAB}{TAB}{TAB}{TAB}TAB{TAB}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}{SHIFT}ENTER{ENTER}{%%}"); +} + + @end