From cac954a00b4cdbcb77bce1411c95c0e8df4cd470 Mon Sep 17 00:00:00 2001 From: zonble Date: Wed, 2 Feb 2022 20:29:23 +0800 Subject: [PATCH] Updates test cases. --- McBopomofoTests/KeyHandlerBopomofoTests.swift | 341 ++++++++++++------ .../KeyHandlerPlainBopomofoTests.swift | 79 ++-- Source/InputMethodController.swift | 7 +- Source/KeyHandler.h | 5 +- Source/KeyHandler.mm | 24 +- 5 files changed, 296 insertions(+), 160 deletions(-) diff --git a/McBopomofoTests/KeyHandlerBopomofoTests.swift b/McBopomofoTests/KeyHandlerBopomofoTests.swift index 8344842f..6fb50e17 100644 --- a/McBopomofoTests/KeyHandlerBopomofoTests.swift +++ b/McBopomofoTests/KeyHandlerBopomofoTests.swift @@ -21,9 +21,8 @@ class KeyHandlerBopomofoTests: XCTestCase { func testIgnoreEmpty() { let input = KeyHandlerInput(inputText: "", keyCode: 0, charCode: 0, flags: [], isVerticalMode: false) var state: InputState = InputState.Empty() - let result = handler.handle(input, state: state) { newState in + let result = handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertFalse(result) @@ -32,9 +31,8 @@ class KeyHandlerBopomofoTests: XCTestCase { func testIgnoreEnter() { let input = KeyHandlerInput(inputText: " ", keyCode: KeyCode.enter.rawValue, charCode: 0, flags: [], isVerticalMode: false) var state: InputState = InputState.Empty() - let result = handler.handle(input, state: state) { newState in + let result = handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertFalse(result) @@ -43,9 +41,8 @@ class KeyHandlerBopomofoTests: XCTestCase { func testIgnoreUp() { let input = KeyHandlerInput(inputText: " ", keyCode: KeyCode.up.rawValue, charCode: 0, flags: [], isVerticalMode: false) var state: InputState = InputState.Empty() - let result = handler.handle(input, state: state) { newState in + let result = handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertFalse(result, "\(state)") @@ -54,9 +51,8 @@ class KeyHandlerBopomofoTests: XCTestCase { func testIgnoreDown() { let input = KeyHandlerInput(inputText: " ", keyCode: KeyCode.down.rawValue, charCode: 0, flags: [], isVerticalMode: false) var state: InputState = InputState.Empty() - let result = handler.handle(input, state: state) { newState in + let result = handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertFalse(result, "\(state)") @@ -65,9 +61,8 @@ class KeyHandlerBopomofoTests: XCTestCase { func testIgnoreLeft() { let input = KeyHandlerInput(inputText: " ", keyCode: KeyCode.left.rawValue, charCode: 0, flags: [], isVerticalMode: false) var state: InputState = InputState.Empty() - let result = handler.handle(input, state: state) { newState in + let result = handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertFalse(result) @@ -76,9 +71,8 @@ class KeyHandlerBopomofoTests: XCTestCase { func testIgnoreRight() { let input = KeyHandlerInput(inputText: " ", keyCode: KeyCode.right.rawValue, charCode: 0, flags: [], isVerticalMode: false) var state: InputState = InputState.Empty() - let result = handler.handle(input, state: state) { newState in + let result = handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertFalse(result) @@ -87,9 +81,8 @@ class KeyHandlerBopomofoTests: XCTestCase { func testIgnorePageUp() { let input = KeyHandlerInput(inputText: " ", keyCode: KeyCode.pageUp.rawValue, charCode: 0, flags: [], isVerticalMode: false) var state: InputState = InputState.Empty() - let result = handler.handle(input, state: state) { newState in + let result = handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertFalse(result) @@ -98,9 +91,8 @@ class KeyHandlerBopomofoTests: XCTestCase { func testIgnorePageDown() { let input = KeyHandlerInput(inputText: " ", keyCode: KeyCode.pageDown.rawValue, charCode: 0, flags: [], isVerticalMode: false) var state: InputState = InputState.Empty() - let result = handler.handle(input, state: state) { newState in + let result = handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertFalse(result) @@ -109,9 +101,8 @@ class KeyHandlerBopomofoTests: XCTestCase { func testIgnoreHome() { let input = KeyHandlerInput(inputText: " ", keyCode: KeyCode.home.rawValue, charCode: 0, flags: [], isVerticalMode: false) var state: InputState = InputState.Empty() - let result = handler.handle(input, state: state) { newState in + let result = handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertFalse(result) @@ -120,9 +111,8 @@ class KeyHandlerBopomofoTests: XCTestCase { func testIgnoreEnd() { let input = KeyHandlerInput(inputText: " ", keyCode: KeyCode.end.rawValue, charCode: 0, flags: [], isVerticalMode: false) var state: InputState = InputState.Empty() - let result = handler.handle(input, state: state) { newState in + let result = handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertFalse(result) @@ -131,9 +121,8 @@ class KeyHandlerBopomofoTests: XCTestCase { func testIgnoreDelete() { let input = KeyHandlerInput(inputText: " ", keyCode: KeyCode.delete.rawValue, charCode: 0, flags: [], isVerticalMode: false) var state: InputState = InputState.Empty() - let result = handler.handle(input, state: state) { newState in + let result = handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertFalse(result) @@ -142,9 +131,8 @@ class KeyHandlerBopomofoTests: XCTestCase { func testIgnoreCommand() { let input = KeyHandlerInput(inputText: "A", keyCode: 0, charCode: 0, flags: [.command], isVerticalMode: false) var state: InputState = InputState.Empty() - let result = handler.handle(input, state: state) { newState in + let result = handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertFalse(result) @@ -153,9 +141,8 @@ class KeyHandlerBopomofoTests: XCTestCase { func testIgnoreOption() { let input = KeyHandlerInput(inputText: "A", keyCode: 0, charCode: 0, flags: [.option], isVerticalMode: false) var state: InputState = InputState.Empty() - let result = handler.handle(input, state: state) { newState in + let result = handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertFalse(result) @@ -164,9 +151,8 @@ class KeyHandlerBopomofoTests: XCTestCase { func testIgnoreNumericPad() { let input = KeyHandlerInput(inputText: "A", keyCode: 0, charCode: 0, flags: [.numericPad], isVerticalMode: false) var state: InputState = InputState.Empty() - let result = handler.handle(input, state: state) { newState in + let result = handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertFalse(result) @@ -175,22 +161,69 @@ class KeyHandlerBopomofoTests: XCTestCase { func testIgnoreCapslock() { let input = KeyHandlerInput(inputText: "A", keyCode: 0, charCode: 0, flags: [.capsLock], isVerticalMode: false) var state: InputState = InputState.Empty() - let result = handler.handle(input, state: state) { newState in + let result = handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertFalse(result) } + func testisNumericPad() { + var input = KeyHandlerInput(inputText: "b", keyCode: 0, charCode: charCode("b"), flags: [], isVerticalMode: false) + var state: InputState = InputState.Empty() + handler.handle(input: input, state: state) { newState in + state = newState + } errorCallback: { + } + input = KeyHandlerInput(inputText: "1", keyCode: 0, charCode: charCode("1"), flags: .numericPad, isVerticalMode: false) + var count = 0 + var empty: InputState = InputState.Empty() + var target: InputState = InputState.Empty() + handler.handle(input: input, state: state) { newState in + switch count { + case 0: + state = newState + case 1: + target = newState + case 2: + empty = newState + default: + break + } + count += 1 + + } errorCallback: { + } + XCTAssertEqual(count, 3) + XCTAssertTrue(state is InputState.Empty, "\(state)") + XCTAssertTrue(empty is InputState.Empty, "\(empty)") + XCTAssertTrue(target is InputState.Committing, "\(target)") + if let state = target as? InputState.Committing { + XCTAssertEqual(state.poppedText, "1") + } + } + + func testLetter() { + let input = KeyHandlerInput(inputText: "A", keyCode: 0, charCode: charCode("A"), flags: .shift, isVerticalMode: false) + var state: InputState = InputState.Empty() + handler.handle(input: input, state: state) { newState in + state = newState + } errorCallback: { + } + + XCTAssertTrue(state is InputState.Inputting, "\(state)") + if let state = state as? InputState.Inputting { + XCTAssertEqual(state.composingBuffer, "a") + } + } + func testPunctuationTable() { let enabled = Preferences.halfWidthPunctuationEnabled Preferences.halfWidthPunctuationEnabled = false let input = KeyHandlerInput(inputText: "`", keyCode: 0, charCode: charCode("`"), flags: .shift, isVerticalMode: false) var state: InputState = InputState.Empty() - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -206,9 +239,8 @@ class KeyHandlerBopomofoTests: XCTestCase { Preferences.halfWidthPunctuationEnabled = true let input = KeyHandlerInput(inputText: "<", keyCode: 0, charCode: charCode("<"), flags: .shift, isVerticalMode: false) var state: InputState = InputState.Empty() - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -225,9 +257,8 @@ class KeyHandlerBopomofoTests: XCTestCase { Preferences.halfWidthPunctuationEnabled = false let input = KeyHandlerInput(inputText: "<", keyCode: 0, charCode: charCode("<"), flags: .shift, isVerticalMode: false) var state: InputState = InputState.Empty() - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -243,9 +274,8 @@ class KeyHandlerBopomofoTests: XCTestCase { Preferences.halfWidthPunctuationEnabled = true let input = KeyHandlerInput(inputText: ">", keyCode: 0, charCode: charCode(">"), flags: .shift, isVerticalMode: false) var state: InputState = InputState.Empty() - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -262,9 +292,26 @@ class KeyHandlerBopomofoTests: XCTestCase { let input = KeyHandlerInput(inputText: ">", keyCode: 0, charCode: charCode(">"), flags: .shift, isVerticalMode: false) var state: InputState = InputState.Empty() - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in + state = newState + } errorCallback: { + } + + XCTAssertTrue(state is InputState.Inputting, "\(state)") + if let state = state as? InputState.Inputting { + XCTAssertEqual(state.composingBuffer, "。") + } + Preferences.halfWidthPunctuationEnabled = enabled + } + + func testCtrlPunctuationPeriod() { + let enabled = Preferences.halfWidthPunctuationEnabled + Preferences.halfWidthPunctuationEnabled = false + + let input = KeyHandlerInput(inputText: ".", keyCode: 0, charCode: charCode("."), flags: .control, isVerticalMode: false) + var state: InputState = InputState.Empty() + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -277,12 +324,13 @@ class KeyHandlerBopomofoTests: XCTestCase { func testInputting() { var state: InputState = InputState.Empty() - let keys = Array("vul3a945j4up gj bj4z83").map { String($0) } + let keys = Array("vul3a945j4up gj bj4z83").map { + String($0) + } for key in keys { let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } } @@ -294,12 +342,13 @@ class KeyHandlerBopomofoTests: XCTestCase { func testInputtingNihao() { var state: InputState = InputState.Empty() - let keys = Array("su3cl3").map { String($0) } + let keys = Array("su3cl3").map { + String($0) + } for key in keys { let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } } @@ -311,12 +360,13 @@ class KeyHandlerBopomofoTests: XCTestCase { func testInputtingTianKong() { var state: InputState = InputState.Empty() - let keys = Array("wu0 dj/ ").map { String($0) } + let keys = Array("wu0 dj/ ").map { + String($0) + } for key in keys { let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } } @@ -328,12 +378,13 @@ class KeyHandlerBopomofoTests: XCTestCase { func testCommittingNihao() { var state: InputState = InputState.Empty() - let keys = Array("su3cl3").map { String($0) } + let keys = Array("su3cl3").map { + String($0) + } for key in keys { let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } } @@ -347,7 +398,7 @@ class KeyHandlerBopomofoTests: XCTestCase { var empty: InputState? var count = 0 - handler.handle(enter, state: state) { newState in + handler.handle(input: enter, state: state) { newState in switch count { case 0: committing = newState @@ -357,7 +408,6 @@ class KeyHandlerBopomofoTests: XCTestCase { break } count += 1 - } candidateSelectionCallback: { } errorCallback: { } @@ -370,12 +420,13 @@ class KeyHandlerBopomofoTests: XCTestCase { func testDelete() { var state: InputState = InputState.Empty() - let keys = Array("su3cl3").map { String($0) } + let keys = Array("su3cl3").map { + String($0) + } for key in keys { let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } } @@ -389,9 +440,8 @@ class KeyHandlerBopomofoTests: XCTestCase { let delete = KeyHandlerInput(inputText: " ", keyCode: KeyCode.delete.rawValue, charCode: 0, flags: [], isVerticalMode: false) var errorCalled = false - handler.handle(left, state: state) { newState in + handler.handle(input: left, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -401,9 +451,8 @@ class KeyHandlerBopomofoTests: XCTestCase { XCTAssertEqual(state.cursorIndex, 1) } - handler.handle(delete, state: state) { newState in + handler.handle(input: delete, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -413,9 +462,8 @@ class KeyHandlerBopomofoTests: XCTestCase { XCTAssertEqual(state.cursorIndex, 1) } - handler.handle(delete, state: state) { newState in + handler.handle(input: delete, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { errorCalled = true } @@ -429,9 +477,8 @@ class KeyHandlerBopomofoTests: XCTestCase { errorCalled = false - handler.handle(left, state: state) { newState in + handler.handle(input: left, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -441,9 +488,8 @@ class KeyHandlerBopomofoTests: XCTestCase { XCTAssertEqual(state.cursorIndex, 0) } - handler.handle(delete, state: state) { newState in + handler.handle(input: delete, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -452,12 +498,13 @@ class KeyHandlerBopomofoTests: XCTestCase { func testBackspace() { var state: InputState = InputState.Empty() - let keys = Array("su3cl3").map { String($0) } + let keys = Array("su3cl3").map { + String($0) + } for key in keys { let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } } @@ -469,9 +516,8 @@ class KeyHandlerBopomofoTests: XCTestCase { let backspace = KeyHandlerInput(inputText: " ", keyCode: 0, charCode: 8, flags: [], isVerticalMode: false) - handler.handle(backspace, state: state) { newState in + handler.handle(input: backspace, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -481,9 +527,8 @@ class KeyHandlerBopomofoTests: XCTestCase { XCTAssertEqual(state.cursorIndex, 1) } - handler.handle(backspace, state: state) { newState in + handler.handle(input: backspace, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -492,12 +537,13 @@ class KeyHandlerBopomofoTests: XCTestCase { func testCursor() { var state: InputState = InputState.Empty() - let keys = Array("su3cl3").map { String($0) } + let keys = Array("su3cl3").map { + String($0) + } for key in keys { let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } } @@ -512,9 +558,8 @@ class KeyHandlerBopomofoTests: XCTestCase { var errorCalled = false - handler.handle(left, state: state) { newState in + handler.handle(input: left, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertTrue(state is InputState.Inputting, "\(state)") @@ -523,9 +568,8 @@ class KeyHandlerBopomofoTests: XCTestCase { XCTAssertEqual(state.cursorIndex, 1) } - handler.handle(left, state: state) { newState in + handler.handle(input: left, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertTrue(state is InputState.Inputting, "\(state)") @@ -534,9 +578,8 @@ class KeyHandlerBopomofoTests: XCTestCase { XCTAssertEqual(state.cursorIndex, 0) } - handler.handle(left, state: state) { newState in + handler.handle(input: left, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { errorCalled = true } @@ -547,9 +590,8 @@ class KeyHandlerBopomofoTests: XCTestCase { } XCTAssertTrue(errorCalled) - handler.handle(right, state: state) { newState in + handler.handle(input: right, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertTrue(state is InputState.Inputting, "\(state)") @@ -558,9 +600,8 @@ class KeyHandlerBopomofoTests: XCTestCase { XCTAssertEqual(state.cursorIndex, 1) } - handler.handle(right, state: state) { newState in + handler.handle(input: right, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } XCTAssertTrue(state is InputState.Inputting, "\(state)") @@ -570,9 +611,8 @@ class KeyHandlerBopomofoTests: XCTestCase { } errorCalled = false - handler.handle(right, state: state) { newState in + handler.handle(input: right, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { errorCalled = true } @@ -586,12 +626,13 @@ class KeyHandlerBopomofoTests: XCTestCase { func testCandidateWithDown() { var state: InputState = InputState.Empty() - let keys = Array("su3").map { String($0) } + let keys = Array("su3").map { + String($0) + } for key in keys { let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } } @@ -602,9 +643,8 @@ class KeyHandlerBopomofoTests: XCTestCase { } let down = KeyHandlerInput(inputText: " ", keyCode: KeyCode.down.rawValue, charCode: 0, flags: [], isVerticalMode: false) - handler.handle(down, state: state) { newState in + handler.handle(input: down, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -621,12 +661,13 @@ class KeyHandlerBopomofoTests: XCTestCase { let enabled = Preferences.chooseCandidateUsingSpace Preferences.chooseCandidateUsingSpace = true var state: InputState = InputState.Empty() - let keys = Array("su3").map { String($0) } + let keys = Array("su3").map { + String($0) + } for key in keys { let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } } @@ -637,9 +678,8 @@ class KeyHandlerBopomofoTests: XCTestCase { } let space = KeyHandlerInput(inputText: " ", keyCode: 0, charCode: 32, flags: [], isVerticalMode: false) - handler.handle(space, state: state) { newState in + handler.handle(input: space, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -653,14 +693,103 @@ class KeyHandlerBopomofoTests: XCTestCase { Preferences.chooseCandidateUsingSpace = enabled } - func testHomeAndEnd() { + func testInputSpace() { + let enabled = Preferences.chooseCandidateUsingSpace + Preferences.chooseCandidateUsingSpace = false var state: InputState = InputState.Empty() - let keys = Array("su3cl3").map { String($0) } + let keys = Array("su3").map { + String($0) + } for key in keys { let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in + state = newState + } errorCallback: { + } + } + XCTAssertTrue(state is InputState.Inputting, "\(state)") + if let state = state as? InputState.Inputting { + XCTAssertEqual(state.composingBuffer, "你") + } + + var count = 0 + var target: InputState = InputState.Empty() + var empty: InputState = InputState.Empty() + + let input = KeyHandlerInput(inputText: " ", keyCode: 0, charCode: 32, flags: [], isVerticalMode: false) + handler.handle(input: input, state: state) { newState in + switch count { + case 0: + state = newState + case 1: + target = newState + case 2: + empty = newState + default: + break + } + count += 1 + } errorCallback: { + } + + XCTAssertEqual(count, 3) + XCTAssertTrue(state is InputState.Committing, "\(state)") + if let state = state as? InputState.Committing { + XCTAssertEqual(state.poppedText, "你") + } + XCTAssertTrue(target is InputState.Committing, "\(target)") + if let target = target as? InputState.Committing { + XCTAssertEqual(target.poppedText, " ") + } + XCTAssertTrue(empty is InputState.Empty, "\(empty)") + Preferences.chooseCandidateUsingSpace = enabled + } + + func testInputSpaceInBetween() { + let enabled = Preferences.chooseCandidateUsingSpace + Preferences.chooseCandidateUsingSpace = false + var state: InputState = InputState.Empty() + let keys = Array("su3cl3").map { + String($0) + } + for key in keys { + let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) + handler.handle(input: input, state: state) { newState in + state = newState + } errorCallback: { + } + } + XCTAssertTrue(state is InputState.Inputting, "\(state)") + if let state = state as? InputState.Inputting { + XCTAssertEqual(state.composingBuffer, "你好") + } + + var input = KeyHandlerInput(inputText: " ", keyCode: KeyCode.left.rawValue, charCode: 0, flags: [], isVerticalMode: false) + handler.handle(input: input, state: state) { newState in + state = newState + } errorCallback: { + } + input = KeyHandlerInput(inputText: " ", keyCode: 0, charCode: 32, flags: [], isVerticalMode: false) + handler.handle(input: input, state: state) { newState in + state = newState + } errorCallback: { + } + XCTAssertTrue(state is InputState.Inputting, "\(state)") + if let state = state as? InputState.Inputting { + XCTAssertEqual(state.composingBuffer, "你 好") + } + Preferences.chooseCandidateUsingSpace = enabled + } + + func testHomeAndEnd() { + var state: InputState = InputState.Empty() + let keys = Array("su3cl3").map { + String($0) + } + for key in keys { + let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } } @@ -673,9 +802,8 @@ class KeyHandlerBopomofoTests: XCTestCase { let home = KeyHandlerInput(inputText: " ", keyCode: KeyCode.home.rawValue, charCode: 0, flags: [], isVerticalMode: false) let end = KeyHandlerInput(inputText: " ", keyCode: KeyCode.end.rawValue, charCode: 0, flags: [], isVerticalMode: false) - handler.handle(home, state: state) { newState in + handler.handle(input: home, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -685,9 +813,8 @@ class KeyHandlerBopomofoTests: XCTestCase { XCTAssertEqual(state.cursorIndex, 0) } - handler.handle(end, state: state) { newState in + handler.handle(input: end, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } diff --git a/McBopomofoTests/KeyHandlerPlainBopomofoTests.swift b/McBopomofoTests/KeyHandlerPlainBopomofoTests.swift index 621f68f2..34d59318 100644 --- a/McBopomofoTests/KeyHandlerPlainBopomofoTests.swift +++ b/McBopomofoTests/KeyHandlerPlainBopomofoTests.swift @@ -16,9 +16,8 @@ class KeyHandlerPlainBopomofoTests: XCTestCase { func testPunctuationTable() { let input = KeyHandlerInput(inputText: "`", keyCode: 0, charCode: charCode("`"), flags: .shift, isVerticalMode: false) var state: InputState = InputState.Empty() - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -29,11 +28,12 @@ class KeyHandlerPlainBopomofoTests: XCTestCase { } func testPunctuationComma() { + let enabled = Preferences.halfWidthPunctuationEnabled + Preferences.halfWidthPunctuationEnabled = false let input = KeyHandlerInput(inputText: "<", keyCode: 0, charCode: charCode("<"), flags: .shift, isVerticalMode: false) var state: InputState = InputState.Empty() - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -41,14 +41,16 @@ class KeyHandlerPlainBopomofoTests: XCTestCase { if let state = state as? InputState.ChoosingCandidate { XCTAssertEqual(state.composingBuffer, "，") } + Preferences.halfWidthPunctuationEnabled = enabled } func testPunctuationPeriod() { + let enabled = Preferences.halfWidthPunctuationEnabled + Preferences.halfWidthPunctuationEnabled = false let input = KeyHandlerInput(inputText: ">", keyCode: 0, charCode: charCode(">"), flags: .shift, isVerticalMode: false) var state: InputState = InputState.Empty() - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -56,14 +58,14 @@ class KeyHandlerPlainBopomofoTests: XCTestCase { if let state = state as? InputState.ChoosingCandidate { XCTAssertEqual(state.composingBuffer, "。") } + Preferences.halfWidthPunctuationEnabled = enabled } func testInputNe() { let input = KeyHandlerInput(inputText: "s", keyCode: 0, charCode: charCode("s"), flags: .shift, isVerticalMode: false) var state: InputState = InputState.Empty() - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -75,12 +77,13 @@ class KeyHandlerPlainBopomofoTests: XCTestCase { func testInputNi() { var state: InputState = InputState.Empty() - let keys = Array("su").map { String($0) } + let keys = Array("su").map { + String($0) + } for key in keys { let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } } @@ -93,12 +96,13 @@ class KeyHandlerPlainBopomofoTests: XCTestCase { func testInputNi3() { var state: InputState = InputState.Empty() - let keys = Array("su3").map { String($0) } + let keys = Array("su3").map { + String($0) + } for key in keys { let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } } @@ -111,20 +115,20 @@ class KeyHandlerPlainBopomofoTests: XCTestCase { func testCancelCandidateUsingDelete() { var state: InputState = InputState.Empty() - let keys = Array("su3").map { String($0) } + let keys = Array("su3").map { + String($0) + } for key in keys { let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } } let input = KeyHandlerInput(inputText: " ", keyCode: KeyCode.delete.rawValue, charCode: 0, flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -133,20 +137,20 @@ class KeyHandlerPlainBopomofoTests: XCTestCase { func testCancelCandidateUsingEsc() { var state: InputState = InputState.Empty() - let keys = Array("su3").map { String($0) } + let keys = Array("su3").map { + String($0) + } for key in keys { let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } } let input = KeyHandlerInput(inputText: " ", keyCode: 0, charCode: 27, flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } @@ -157,12 +161,13 @@ class KeyHandlerPlainBopomofoTests: XCTestCase { let enabled = Preferences.associatedPhrasesEnabled Preferences.associatedPhrasesEnabled = true var state: InputState = InputState.Empty() - let keys = Array("aul ").map { String($0) } + let keys = Array("aul ").map { + String($0) + } for key in keys { let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) - handler.handle(input, state: state) { newState in + handler.handle(input: input, state: state) { newState in state = newState - } candidateSelectionCallback: { } errorCallback: { } } @@ -175,4 +180,24 @@ class KeyHandlerPlainBopomofoTests: XCTestCase { } + func testNoAssociatedPhrases() { + let enabled = Preferences.associatedPhrasesEnabled + Preferences.associatedPhrasesEnabled = false + var state: InputState = InputState.Empty() + let keys = Array("aul ").map { + String($0) + } + for key in keys { + let input = KeyHandlerInput(inputText: key, keyCode: 0, charCode: charCode(key), flags: [], isVerticalMode: false) + handler.handle(input: input, state: state) { newState in + state = newState + + } errorCallback: { + } + } + + XCTAssertTrue(state is InputState.Empty, "\(state)") + Preferences.associatedPhrasesEnabled = enabled + } + } diff --git a/Source/InputMethodController.swift b/Source/InputMethodController.swift index f236fb5a..98262b9c 100644 --- a/Source/InputMethodController.swift +++ b/Source/InputMethodController.swift @@ -71,7 +71,7 @@ class McBopomofoInputMethodController: IMKInputController { let halfWidthPunctuationItem = menu.addItem(withTitle: NSLocalizedString("Use Half-Width Punctuations", comment: ""), action: #selector(toggleHalfWidthPunctuation(_:)), keyEquivalent: "h") halfWidthPunctuationItem.keyEquivalentModifierMask = [.command, .control] - halfWidthPunctuationItem.state = Preferences.chineseConversionEnabled.state + halfWidthPunctuationItem.state = Preferences.halfWidthPunctuationEnabled.state let inputMode = keyHandler.inputMode let optionKeyPressed = NSEvent.modifierFlags.contains(.option) @@ -181,9 +181,8 @@ class McBopomofoInputMethodController: IMKInputController { let input = KeyHandlerInput(event: event, isVerticalMode: useVerticalMode) - let result = keyHandler.handle(input, state: state) { newState in + let result = keyHandler.handle(input: input, state: state) { newState in self.handle(state: newState, client: client) - } candidateSelectionCallback: { } errorCallback: { NSSound.beep() } @@ -575,7 +574,7 @@ extension McBopomofoInputMethodController: CandidateControllerDelegate { if let state = state as? InputState.ChoosingCandidate { let selectedValue = state.candidates[Int(index)] - keyHandler.fixNode(withValue: selectedValue) + keyHandler.fixNode(value: selectedValue) guard let inputting = keyHandler.buildInputtingState() as? InputState.Inputting else { return diff --git a/Source/KeyHandler.h b/Source/KeyHandler.h index 4c0093e0..c537b7f4 100644 --- a/Source/KeyHandler.h +++ b/Source/KeyHandler.h @@ -45,11 +45,10 @@ extern InputMode InputModePlainBopomofo; - (BOOL)handleInput:(KeyHandlerInput *)input state:(InputState *)state stateCallback:(void (^)(InputState *))stateCallback -candidateSelectionCallback:(void (^)(void))candidateSelectionCallback - errorCallback:(void (^)(void))errorCallback; + errorCallback:(void (^)(void))errorCallback NS_SWIFT_NAME(handle(input:state:stateCallback:errorCallback:)); - (void)syncWithPreferences; -- (void)fixNodeWithValue:(NSString *)value; +- (void)fixNodeWithValue:(NSString *)value NS_SWIFT_NAME(fixNode(value:)); - (void)clear; - (InputState *)buildInputtingState; diff --git a/Source/KeyHandler.mm b/Source/KeyHandler.mm index 8d32facf..0d78c231 100644 --- a/Source/KeyHandler.mm +++ b/Source/KeyHandler.mm @@ -219,7 +219,7 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot return layout; } -- (BOOL)handleInput:(KeyHandlerInput *)input state:(InputState *)inState stateCallback:(void (^)(InputState *))stateCallback candidateSelectionCallback:(void (^)(void))candidateSelectionCallback errorCallback:(void (^)(void))errorCallback +- (BOOL)handleInput:(KeyHandlerInput *)input state:(InputState *)inState stateCallback:(void (^)(InputState *))stateCallback errorCallback:(void (^)(void))errorCallback { InputState *state = inState; UniChar charCode = input.charCode; @@ -278,12 +278,12 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot // MARK: Handle Candidates if ([state isKindOfClass:[InputStateChoosingCandidate class]]) { - return [self _handleCandidateState:state input:input stateCallback:stateCallback candidateSelectionCallback:candidateSelectionCallback errorCallback:errorCallback]; + return [self _handleCandidateState:state input:input stateCallback:stateCallback errorCallback:errorCallback]; } // MARK: Handle Associated Phrases if ([state isKindOfClass:[InputStateAssociatedPhrases class]]) { - BOOL result = [self _handleCandidateState:state input:input stateCallback:stateCallback candidateSelectionCallback:candidateSelectionCallback errorCallback:errorCallback]; + BOOL result = [self _handleCandidateState:state input:input stateCallback:stateCallback errorCallback:errorCallback]; if (result) { return YES; } @@ -294,7 +294,7 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot // MARK: Handle Marking if ([state isKindOfClass:[InputStateMarking class]]) { InputStateMarking *marking = (InputStateMarking *) state; - if ([self _handleMarkingState:(InputStateMarking *) state input:input stateCallback:stateCallback candidateSelectionCallback:candidateSelectionCallback errorCallback:errorCallback]) { + if ([self _handleMarkingState:(InputStateMarking *) state input:input stateCallback:stateCallback errorCallback:errorCallback]) { return YES; } state = [marking convertToInputting]; @@ -820,7 +820,6 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot - (BOOL)_handleMarkingState:(InputStateMarking *)state input:(KeyHandlerInput *)input stateCallback:(void (^)(InputState *))stateCallback - candidateSelectionCallback:(void (^)(void))candidateSelectionCallback errorCallback:(void (^)(void))errorCallback { UniChar charCode = input.charCode; @@ -880,7 +879,6 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot - (BOOL)_handleCandidateState:(InputState *)state input:(KeyHandlerInput *)input stateCallback:(void (^)(InputState *))stateCallback - candidateSelectionCallback:(void (^)(void))candidateSelectionCallback errorCallback:(void (^)(void))errorCallback; { NSString *inputText = input.inputText; @@ -922,7 +920,6 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot if (!updated) { errorCallback(); } - candidateSelectionCallback(); return YES; } @@ -931,7 +928,6 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot if (!updated) { errorCallback(); } - candidateSelectionCallback(); return YES; } @@ -947,7 +943,6 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot errorCallback(); } } - candidateSelectionCallback(); return YES; } @@ -956,7 +951,6 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot if (!updated) { errorCallback(); } - candidateSelectionCallback(); return YES; } @@ -972,7 +966,6 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot errorCallback(); } } - candidateSelectionCallback(); return YES; } @@ -981,7 +974,6 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot if (!updated) { errorCallback(); } - candidateSelectionCallback(); return YES; } @@ -997,7 +989,6 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot errorCallback(); } } - candidateSelectionCallback(); return YES; } @@ -1013,7 +1004,6 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot errorCallback(); } } - candidateSelectionCallback(); return YES; } @@ -1024,7 +1014,6 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot gCurrentCandidateController.selectedCandidateIndex = 0; } - candidateSelectionCallback(); return YES; } @@ -1046,8 +1035,6 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot } else { gCurrentCandidateController.selectedCandidateIndex = candidates.count - 1; } - - candidateSelectionCallback(); return YES; } @@ -1115,14 +1102,13 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot [self clear]; InputStateEmptyIgnoringPreviousState *empty = [[InputStateEmptyIgnoringPreviousState alloc] init]; stateCallback(empty); - [self handleInput:input state:empty stateCallback:stateCallback candidateSelectionCallback:candidateSelectionCallback errorCallback:errorCallback]; + [self handleInput:input state:empty stateCallback:stateCallback errorCallback:errorCallback]; } return YES; } } errorCallback(); - candidateSelectionCallback(); return YES; }