diff options
Diffstat (limited to 't')
| -rw-r--r-- | t/12strpkey.c | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/t/12strpkey.c b/t/12strpkey.c index 363d6e8..8f233a6 100644 --- a/t/12strpkey.c +++ b/t/12strpkey.c @@ -5,88 +5,77 @@ int main(int argc, char *argv[]) { TermKey *tk; TermKeyKey key; - TermKeyResult res; #define CLEAR_KEY do { key.type = -1; key.code.codepoint = -1; key.modifiers = -1; key.utf8[0] = 0; } while(0) - plan_tests(48); + plan_tests(38); tk = termkey_new(0, TERMKEY_FLAG_NOTERMIOS); CLEAR_KEY; - res = termkey_strpkey(tk, "A", &key, 0); - is_int(res, TERMKEY_RES_KEY, "result for unicode/A/0"); + termkey_strpkey(tk, "A", &key, 0); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/A/0"); - is_int(key.code.codepoint, 'A', "key.code.codepoint for unicode/A/0"); + is_int(key.code.codepoint, 'A', "key.code.codepoint for unicode/A/0"); is_int(key.modifiers, 0, "key.modifiers for unicode/A/0"); is_str(key.utf8, "A", "key.utf8 for unicode/A/0"); CLEAR_KEY; - res = termkey_strpkey(tk, "C-b", &key, 0); - is_int(res, TERMKEY_RES_KEY, "result for unicode/b/CTRL"); + termkey_strpkey(tk, "C-b", &key, 0); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/b/CTRL"); - is_int(key.code.codepoint, 'b', "key.code.codepoint for unicode/b/CTRL"); + is_int(key.code.codepoint, 'b', "key.code.codepoint for unicode/b/CTRL"); is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers for unicode/b/CTRL"); is_str(key.utf8, "b", "key.utf8 for unicode/b/CTRL"); CLEAR_KEY; - res = termkey_strpkey(tk, "Ctrl-b", &key, TERMKEY_FORMAT_LONGMOD); - is_int(res, TERMKEY_RES_KEY, "result for unicode/b/CTRL longmod"); + termkey_strpkey(tk, "Ctrl-b", &key, TERMKEY_FORMAT_LONGMOD); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/b/CTRL longmod"); - is_int(key.code.codepoint, 'b', "key.code.codepoint for unicode/b/CTRL longmod"); + is_int(key.code.codepoint, 'b', "key.code.codepoint for unicode/b/CTRL longmod"); is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers for unicode/b/CTRL longmod"); is_str(key.utf8, "b", "key.utf8 for unicode/b/CTRL longmod"); CLEAR_KEY; - res = termkey_strpkey(tk, "^B", &key, TERMKEY_FORMAT_CARETCTRL); - is_int(res, TERMKEY_RES_KEY, "result for unicode/b/CTRL caretctrl"); + termkey_strpkey(tk, "^B", &key, TERMKEY_FORMAT_CARETCTRL); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/b/CTRL caretctrl"); - is_int(key.code.codepoint, 'b', "key.code.codepoint for unicode/b/CTRL caretctrl"); + is_int(key.code.codepoint, 'b', "key.code.codepoint for unicode/b/CTRL caretctrl"); is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers for unicode/b/CTRL caretctrl"); is_str(key.utf8, "b", "key.utf8 for unicode/b/CTRL caretctrl"); CLEAR_KEY; - res = termkey_strpkey(tk, "A-c", &key, 0); - is_int(res, TERMKEY_RES_KEY, "result for unicode/c/ALT"); + termkey_strpkey(tk, "A-c", &key, 0); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT"); - is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT"); + is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT"); is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT"); is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT"); CLEAR_KEY; - res = termkey_strpkey(tk, "Alt-c", &key, TERMKEY_FORMAT_LONGMOD); - is_int(res, TERMKEY_RES_KEY, "result for unicode/c/ALT longmod"); + termkey_strpkey(tk, "Alt-c", &key, TERMKEY_FORMAT_LONGMOD); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT longmod"); - is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT longmod"); + is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT longmod"); is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT longmod"); is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT longmod"); CLEAR_KEY; - res = termkey_strpkey(tk, "M-c", &key, TERMKEY_FORMAT_ALTISMETA); - is_int(res, TERMKEY_RES_KEY, "result for unicode/c/ALT altismeta"); + termkey_strpkey(tk, "M-c", &key, TERMKEY_FORMAT_ALTISMETA); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT altismeta"); - is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT altismeta"); + is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT altismeta"); is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT altismeta"); is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT altismeta"); CLEAR_KEY; - res = termkey_strpkey(tk, "Meta-c", &key, TERMKEY_FORMAT_ALTISMETA|TERMKEY_FORMAT_LONGMOD); - is_int(res, TERMKEY_RES_KEY, "result for unicode/c/ALT altismeta+longmod"); + termkey_strpkey(tk, "Meta-c", &key, TERMKEY_FORMAT_ALTISMETA|TERMKEY_FORMAT_LONGMOD); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type for unicode/c/ALT altismeta+longmod"); - is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT altismeta+longmod"); + is_int(key.code.codepoint, 'c', "key.code.codepoint for unicode/c/ALT altismeta+longmod"); is_int(key.modifiers, TERMKEY_KEYMOD_ALT, "key.modifiers for unicode/c/ALT altismeta+longmod"); is_str(key.utf8, "c", "key.utf8 for unicode/c/ALT altismeta+longmod"); CLEAR_KEY; - res = termkey_strpkey(tk, "Up", &key, 0); - is_int(res, TERMKEY_RES_KEY, "result for sym/Up/0"); + termkey_strpkey(tk, "Up", &key, 0); is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type for sym/Up/0"); is_int(key.code.sym, TERMKEY_SYM_UP, "key.code.codepoint for sym/Up/0"); is_int(key.modifiers, 0, "key.modifiers for sym/Up/0"); CLEAR_KEY; - res = termkey_strpkey(tk, "F5", &key, 0); - is_int(res, TERMKEY_RES_KEY, "result for func/5/0"); + termkey_strpkey(tk, "F5", &key, 0); is_int(key.type, TERMKEY_TYPE_FUNCTION, "key.type for func/5/0"); is_int(key.code.number, 5, "key.code.number for func/5/0"); is_int(key.modifiers, 0, "key.modifiers for func/5/0"); |