p
/
termo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unit tests should use .code.codepoint/.sym instead of not .code.number when appropriate

This commit is contained in:
Paul LeoNerd Evans 2014-03-05 01:11:45 +00:00
parent 97e0e9cde2
commit 8aa5b7acb5
4 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/02getkey.c
View File

@ -21,7 +21,7 @@ int main(int argc, char *argv[])
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after h"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after h");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type after h"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type after h");
is_int(key.code.number, 'h', "key.code.number after h"); is_int(key.code.codepoint, 'h', "key.code.codepoint after h");
is_int(key.modifiers, 0, "key.modifiers after h"); is_int(key.modifiers, 0, "key.modifiers after h");
is_str(key.utf8, "h", "key.utf8 after h"); is_str(key.utf8, "h", "key.utf8 after h");
@ -34,7 +34,7 @@ int main(int argc, char *argv[])
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after C-a"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after C-a");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type after C-a"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type after C-a");
is_int(key.code.number, 'a', "key.code.number after C-a"); is_int(key.code.codepoint, 'a', "key.code.codepoint after C-a");
is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers after C-a"); is_int(key.modifiers, TERMKEY_KEYMOD_CTRL, "key.modifiers after C-a");
termkey_push_bytes(tk, "\033OA", 3); termkey_push_bytes(tk, "\033OA", 3);

44
t/03utf8.c
View File

@ -14,7 +14,7 @@ int main(int argc, char *argv[])
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY low ASCII"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY low ASCII");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type low ASCII"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type low ASCII");
is_int(key.code.number, 'a', "key.code.number low ASCII"); is_int(key.code.codepoint, 'a', "key.code.codepoint low ASCII");
/* 2-byte UTF-8 range is U+0080 to U+07FF (0xDF 0xBF) */ /* 2-byte UTF-8 range is U+0080 to U+07FF (0xDF 0xBF) */
/* However, we'd best avoid the C1 range, so we'll start at U+00A0 (0xC2 0xA0) */ /* However, we'd best avoid the C1 range, so we'll start at U+00A0 (0xC2 0xA0) */
@ -23,13 +23,13 @@ int main(int argc, char *argv[])
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 low"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 low");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 2 low"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 2 low");
is_int(key.code.number, 0x00A0, "key.code.number UTF-8 2 low"); is_int(key.code.codepoint, 0x00A0, "key.code.codepoint UTF-8 2 low");
termkey_push_bytes(tk, "\xDF\xBF", 2); termkey_push_bytes(tk, "\xDF\xBF", 2);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 high"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 high");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 2 high"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 2 high");
is_int(key.code.number, 0x07FF, "key.code.number UTF-8 2 high"); is_int(key.code.codepoint, 0x07FF, "key.code.codepoint UTF-8 2 high");
/* 3-byte UTF-8 range is U+0800 (0xE0 0xA0 0x80) to U+FFFD (0xEF 0xBF 0xBD) */ /* 3-byte UTF-8 range is U+0800 (0xE0 0xA0 0x80) to U+FFFD (0xEF 0xBF 0xBD) */
@ -37,13 +37,13 @@ int main(int argc, char *argv[])
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 low"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 low");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 3 low"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 3 low");
is_int(key.code.number, 0x0800, "key.code.number UTF-8 3 low"); is_int(key.code.codepoint, 0x0800, "key.code.codepoint UTF-8 3 low");
termkey_push_bytes(tk, "\xEF\xBF\xBD", 3); termkey_push_bytes(tk, "\xEF\xBF\xBD", 3);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 high"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 high");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 3 high"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 3 high");
is_int(key.code.number, 0xFFFD, "key.code.number UTF-8 3 high"); is_int(key.code.codepoint, 0xFFFD, "key.code.codepoint UTF-8 3 high");
/* 4-byte UTF-8 range is U+10000 (0xF0 0x90 0x80 0x80) to U+10FFFF (0xF4 0x8F 0xBF 0xBF) */ /* 4-byte UTF-8 range is U+10000 (0xF0 0x90 0x80 0x80) to U+10FFFF (0xF4 0x8F 0xBF 0xBF) */
@ -51,57 +51,57 @@ int main(int argc, char *argv[])
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 low"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 low");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 4 low"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 4 low");
is_int(key.code.number, 0x10000, "key.code.number UTF-8 4 low"); is_int(key.code.codepoint, 0x10000, "key.code.codepoint UTF-8 4 low");
termkey_push_bytes(tk, "\xF4\x8F\xBF\xBF", 4); termkey_push_bytes(tk, "\xF4\x8F\xBF\xBF", 4);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 high"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 high");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 4 high"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type UTF-8 4 high");
is_int(key.code.number, 0x10FFFF, "key.code.number UTF-8 4 high"); is_int(key.code.codepoint, 0x10FFFF, "key.code.codepoint UTF-8 4 high");
/* Invalid continuations */ /* Invalid continuations */
termkey_push_bytes(tk, "\xC2!", 2); termkey_push_bytes(tk, "\xC2!", 2);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 invalid cont"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 invalid cont");
is_int(key.code.number, 0xFFFD, "key.code.number UTF-8 2 invalid cont"); is_int(key.code.codepoint, 0xFFFD, "key.code.codepoint UTF-8 2 invalid cont");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 invalid after"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 invalid after");
is_int(key.code.number, '!', "key.code.number UTF-8 2 invalid after"); is_int(key.code.codepoint, '!', "key.code.codepoint UTF-8 2 invalid after");
termkey_push_bytes(tk, "\xE0!", 2); termkey_push_bytes(tk, "\xE0!", 2);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 invalid cont"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 invalid cont");
is_int(key.code.number, 0xFFFD, "key.code.number UTF-8 3 invalid cont"); is_int(key.code.codepoint, 0xFFFD, "key.code.codepoint UTF-8 3 invalid cont");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 invalid after"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 invalid after");
is_int(key.code.number, '!', "key.code.number UTF-8 3 invalid after"); is_int(key.code.codepoint, '!', "key.code.codepoint UTF-8 3 invalid after");
termkey_push_bytes(tk, "\xE0\xA0!", 3); termkey_push_bytes(tk, "\xE0\xA0!", 3);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 invalid cont 2"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 invalid cont 2");
is_int(key.code.number, 0xFFFD, "key.code.number UTF-8 3 invalid cont 2"); is_int(key.code.codepoint, 0xFFFD, "key.code.codepoint UTF-8 3 invalid cont 2");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 invalid after"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 invalid after");
is_int(key.code.number, '!', "key.code.number UTF-8 3 invalid after"); is_int(key.code.codepoint, '!', "key.code.codepoint UTF-8 3 invalid after");
termkey_push_bytes(tk, "\xF0!", 2); termkey_push_bytes(tk, "\xF0!", 2);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid cont"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid cont");
is_int(key.code.number, 0xFFFD, "key.code.number UTF-8 4 invalid cont"); is_int(key.code.codepoint, 0xFFFD, "key.code.codepoint UTF-8 4 invalid cont");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid after"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid after");
is_int(key.code.number, '!', "key.code.number UTF-8 4 invalid after"); is_int(key.code.codepoint, '!', "key.code.codepoint UTF-8 4 invalid after");
termkey_push_bytes(tk, "\xF0\x90!", 3); termkey_push_bytes(tk, "\xF0\x90!", 3);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid cont 2"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid cont 2");
is_int(key.code.number, 0xFFFD, "key.code.number UTF-8 4 invalid cont 2"); is_int(key.code.codepoint, 0xFFFD, "key.code.codepoint UTF-8 4 invalid cont 2");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid after"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid after");
is_int(key.code.number, '!', "key.code.number UTF-8 4 invalid after"); is_int(key.code.codepoint, '!', "key.code.codepoint UTF-8 4 invalid after");
termkey_push_bytes(tk, "\xF0\x90\x80!", 4); termkey_push_bytes(tk, "\xF0\x90\x80!", 4);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid cont 3"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid cont 3");
is_int(key.code.number, 0xFFFD, "key.code.number UTF-8 4 invalid cont 3"); is_int(key.code.codepoint, 0xFFFD, "key.code.codepoint UTF-8 4 invalid cont 3");
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid after"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 invalid after");
is_int(key.code.number, '!', "key.code.number UTF-8 4 invalid after"); is_int(key.code.codepoint, '!', "key.code.codepoint UTF-8 4 invalid after");
/* Partials */ /* Partials */
@ -110,7 +110,7 @@ int main(int argc, char *argv[])
termkey_push_bytes(tk, "\xA0", 1); termkey_push_bytes(tk, "\xA0", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 partial"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 2 partial");
is_int(key.code.number, 0x00A0, "key.code.number UTF-8 2 partial"); is_int(key.code.codepoint, 0x00A0, "key.code.codepoint UTF-8 2 partial");
termkey_push_bytes(tk, "\xE0", 1); termkey_push_bytes(tk, "\xE0", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN UTF-8 3 partial"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN UTF-8 3 partial");
@ -120,7 +120,7 @@ int main(int argc, char *argv[])
termkey_push_bytes(tk, "\x80", 1); termkey_push_bytes(tk, "\x80", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 partial"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 3 partial");
is_int(key.code.number, 0x0800, "key.code.number UTF-8 3 partial"); is_int(key.code.codepoint, 0x0800, "key.code.codepoint UTF-8 3 partial");
termkey_push_bytes(tk, "\xF0", 1); termkey_push_bytes(tk, "\xF0", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN UTF-8 4 partial"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN UTF-8 4 partial");
@ -133,7 +133,7 @@ int main(int argc, char *argv[])
termkey_push_bytes(tk, "\x80", 1); termkey_push_bytes(tk, "\x80", 1);
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 partial"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY UTF-8 4 partial");
is_int(key.code.number, 0x10000, "key.code.number UTF-8 4 partial"); is_int(key.code.codepoint, 0x10000, "key.code.codepoint UTF-8 4 partial");
termkey_destroy(tk); termkey_destroy(tk);

4
t/04flags.c
View File

@ -16,7 +16,7 @@ int main(int argc, char *argv[])
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after space"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after space");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type after space"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type after space");
is_int(key.code.number, ' ', "key.code.number after space"); is_int(key.code.codepoint, ' ', "key.code.codepoint after space");
is_int(key.modifiers, 0, "key.modifiers after space"); is_int(key.modifiers, 0, "key.modifiers after space");
termkey_set_flags(tk, TERMKEY_FLAG_SPACESYMBOL); termkey_set_flags(tk, TERMKEY_FLAG_SPACESYMBOL);
@ -26,7 +26,7 @@ int main(int argc, char *argv[])
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after space"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after space");
is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type after space with FLAG_SPACESYMBOL"); is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type after space with FLAG_SPACESYMBOL");
is_int(key.code.number, TERMKEY_SYM_SPACE, "key.code.sym after space with FLAG_SPACESYMBOL"); is_int(key.code.sym, TERMKEY_SYM_SPACE, "key.code.sym after space with FLAG_SPACESYMBOL");
is_int(key.modifiers, 0, "key.modifiers after space with FLAG_SPACESYMBOL"); is_int(key.modifiers, 0, "key.modifiers after space with FLAG_SPACESYMBOL");
termkey_destroy(tk); termkey_destroy(tk);

2
t/05read.c
View File

@ -35,7 +35,7 @@ int main(int argc, char *argv[])
is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after h"); is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after h");
is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type after h"); is_int(key.type, TERMKEY_TYPE_UNICODE, "key.type after h");
is_int(key.code.number, 'h', "key.code.number after h"); is_int(key.code.codepoint, 'h', "key.code.codepoint after h");
is_int(key.modifiers, 0, "key.modifiers after h"); is_int(key.modifiers, 0, "key.modifiers after h");
is_str(key.utf8, "h", "key.utf8 after h"); is_str(key.utf8, "h", "key.utf8 after h");