floraachy
/
vChewing-macOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds test cases.

This commit is contained in:
zonble 2022-02-02 21:10:26 +08:00
parent cac954a00b
commit 44ecf223d7
2 changed files with 269 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

260
McBopomofoTests/KeyHandlerBopomofoTests.swift
View File

@ -322,6 +322,24 @@ class KeyHandlerBopomofoTests: XCTestCase {
Preferences.halfWidthPunctuationEnabled = enabled Preferences.halfWidthPunctuationEnabled = enabled
} }
func testInvalidBpmf() {
var state: InputState = InputState.Empty()
let keys = Array("ni4").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, "ㄙㄛˋ")
}
}
func testInputting() { func testInputting() {
var state: InputState = InputState.Empty() var state: InputState = InputState.Empty()
let keys = Array("vul3a945j4up gj bj4z83").map { let keys = Array("vul3a945j4up gj bj4z83").map {
@ -824,4 +842,246 @@ class KeyHandlerBopomofoTests: XCTestCase {
} }
} }
func testMarkingLeft() {
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, "你好")
XCTAssertEqual(state.cursorIndex, 2)
}
var input = KeyHandlerInput(inputText: " ", keyCode: KeyCode.left.rawValue, charCode: 0, flags: .shift, isVerticalMode: false)
handler.handle(input: input, state: state) { newState in
state = newState
} errorCallback: {
}
XCTAssertTrue(state is InputState.Marking, "\(state)")
if let state = state as? InputState.Marking {
XCTAssertEqual(state.composingBuffer, "你好")
XCTAssertEqual(state.cursorIndex, 2)
XCTAssertEqual(state.markerIndex, 1)
XCTAssertEqual(state.markedRange, NSRange(location: 1, length: 1))
}
input = KeyHandlerInput(inputText: " ", keyCode: KeyCode.left.rawValue, charCode: 0, flags: .shift, isVerticalMode: false)
handler.handle(input: input, state: state) { newState in
state = newState
} errorCallback: {
}
XCTAssertTrue(state is InputState.Marking, "\(state)")
if let state = state as? InputState.Marking {
XCTAssertEqual(state.composingBuffer, "你好")
XCTAssertEqual(state.cursorIndex, 2)
XCTAssertEqual(state.markerIndex, 0)
XCTAssertEqual(state.markedRange, NSRange(location: 0, length: 2))
}
}
func testMarkingRight() {
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, "你好")
XCTAssertEqual(state.cursorIndex, 2)
}
let left = KeyHandlerInput(inputText: " ", keyCode: KeyCode.left.rawValue, charCode: 0, flags: [], isVerticalMode: false)
handler.handle(input: left, state: state) { newState in
state = newState
} errorCallback: {
}
handler.handle(input: left, state: state) { newState in
state = newState
} errorCallback: {
}
let input = KeyHandlerInput(inputText: " ", keyCode: KeyCode.right.rawValue, charCode: 0, flags: .shift, isVerticalMode: false)
handler.handle(input: input, state: state) { newState in
state = newState
} errorCallback: {
}
XCTAssertTrue(state is InputState.Marking, "\(state)")
if let state = state as? InputState.Marking {
XCTAssertEqual(state.composingBuffer, "你好")
XCTAssertEqual(state.cursorIndex, 0)
XCTAssertEqual(state.markerIndex, 1)
XCTAssertEqual(state.markedRange, NSRange(location: 0, length: 1))
}
handler.handle(input: input, state: state) { newState in
state = newState
} errorCallback: {
}
XCTAssertTrue(state is InputState.Marking, "\(state)")
if let state = state as? InputState.Marking {
XCTAssertEqual(state.composingBuffer, "你好")
XCTAssertEqual(state.cursorIndex, 0)
XCTAssertEqual(state.markerIndex, 2)
XCTAssertEqual(state.markedRange, NSRange(location: 0, length: 2))
}
}
func testCancelMarking() {
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, "你好")
XCTAssertEqual(state.cursorIndex, 2)
}
var input = KeyHandlerInput(inputText: " ", keyCode: KeyCode.left.rawValue, charCode: 0, flags: .shift, isVerticalMode: false)
handler.handle(input: input, state: state) { newState in
state = newState
} errorCallback: {
}
XCTAssertTrue(state is InputState.Marking, "\(state)")
if let state = state as? InputState.Marking {
XCTAssertEqual(state.composingBuffer, "你好")
XCTAssertEqual(state.cursorIndex, 2)
XCTAssertEqual(state.markerIndex, 1)
XCTAssertEqual(state.markedRange, NSRange(location: 1, length: 1))
}
input = KeyHandlerInput(inputText: "1", keyCode: 0, charCode: charCode("1"), 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, "你好ㄅ")
}
}
func testEscToClearReadingAndGoToEmpty() {
let enabled = Preferences.escToCleanInputBuffer
Preferences.escToCleanInputBuffer = false
var state: InputState = InputState.Empty()
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: input, state: state) { newState in
state = newState
} errorCallback: {
}
}
XCTAssertTrue(state is InputState.Inputting, "\(state)")
if let state = state as? InputState.Inputting {
XCTAssertEqual(state.composingBuffer, "ㄋㄧ")
XCTAssertEqual(state.cursorIndex, 2)
}
let input = KeyHandlerInput(inputText: " ", keyCode: 0, charCode: 27, flags: [], isVerticalMode: false)
handler.handle(input: input, state: state) { newState in
state = newState
} errorCallback: {
}
XCTAssertTrue(state is InputState.Empty, "\(state)")
Preferences.escToCleanInputBuffer = enabled
}
func testEscToClearReadingAndGoToInputting() {
let enabled = Preferences.escToCleanInputBuffer
Preferences.escToCleanInputBuffer = false
var state: InputState = InputState.Empty()
let keys = Array("su3cl").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, "你ㄏㄠ")
XCTAssertEqual(state.cursorIndex, 3)
}
let input = KeyHandlerInput(inputText: " ", keyCode: 0, charCode: 27, 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, "你")
XCTAssertEqual(state.cursorIndex, 1)
}
Preferences.escToCleanInputBuffer = enabled
}
func testEscToClearAll() {
let enabled = Preferences.escToCleanInputBuffer
Preferences.escToCleanInputBuffer = true
var state: InputState = InputState.Empty()
let keys = Array("su3cl").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, "你ㄏㄠ")
XCTAssertEqual(state.cursorIndex, 3)
}
let input = KeyHandlerInput(inputText: " ", keyCode: 0, charCode: 27, flags: [], isVerticalMode: false)
handler.handle(input: input, state: state) { newState in
state = newState
} errorCallback: {
}
XCTAssertTrue(state is InputState.EmptyIgnoringPreviousState, "\(state)")
Preferences.escToCleanInputBuffer = enabled
}
} }

9
Source/KeyHandler.mm
View File

@ -553,10 +553,15 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot
if (!_bpmfReadingBuffer->isEmpty()) { if (!_bpmfReadingBuffer->isEmpty()) {
_bpmfReadingBuffer->clear(); _bpmfReadingBuffer->clear();
if (!_builder->length()) {
InputStateEmpty *empty = [[InputStateEmpty alloc] init];
stateCallback(empty);
} else {
InputStateInputting *inputting = (InputStateInputting *)[self buildInputtingState]; InputStateInputting *inputting = (InputStateInputting *)[self buildInputtingState];
stateCallback(inputting); stateCallback(inputting);
} }
} }
}
return YES; return YES;
} }
@ -717,11 +722,11 @@ static NSString *const kGraphVizOutputfile = @"/tmp/McBopomofo-visualization.dot
_bpmfReadingBuffer->backspace(); _bpmfReadingBuffer->backspace();
} }
InputStateInputting *inputting = (InputStateInputting *)[self buildInputtingState]; if (!_builder->length()) {
if (!inputting.composingBuffer.length) {
InputStateEmptyIgnoringPreviousState *empty = [[InputStateEmptyIgnoringPreviousState alloc] init]; InputStateEmptyIgnoringPreviousState *empty = [[InputStateEmptyIgnoringPreviousState alloc] init];
stateCallback(empty); stateCallback(empty);
} else { } else {
InputStateInputting *inputting = (InputStateInputting *)[self buildInputtingState];
stateCallback(inputting); stateCallback(inputting);
} }
return YES; return YES;