From 3465d5553fbe88a75320d1da3f7228619492b036 Mon Sep 17 00:00:00 2001 From: Přemysl Janouch Date: Sun, 28 Sep 2014 05:56:13 +0200 Subject: Make the tests work again Our UTF-8 parsing now behaves differently, though. --- t/05read.c | 95 +++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 41 deletions(-) (limited to 't/05read.c') diff --git a/t/05read.c b/t/05read.c index a76cd0a..2a5530a 100644 --- a/t/05read.c +++ b/t/05read.c @@ -3,70 +3,83 @@ #include "../termkey.h" #include "taplib.h" -int main(int argc, char *argv[]) +int +main (int argc, char *argv[]) { - int fd[2]; - TermKey *tk; - TermKeyKey key; + int fd[2]; + termkey_t *tk; + termkey_key_t key; - plan_tests(21); + plan_tests (21); - /* We'll need a real filehandle we can write/read. - * pipe() can make us one */ - pipe(fd); + /* We'll need a real filehandle we can write/read. + * pipe () can make us one */ + pipe (fd); - /* Sanitise this just in case */ - putenv("TERM=vt100"); + /* Sanitise this just in case */ + putenv ("TERM=vt100"); - tk = termkey_new(fd[0], TERMKEY_FLAG_NOTERMIOS); + tk = termkey_new (fd[0], NULL, TERMKEY_FLAG_NOTERMIOS); - is_int(termkey_get_buffer_remaining(tk), 256, "buffer free initially 256"); + is_int (termkey_get_buffer_remaining (tk), 256, + "buffer free initially 256"); - is_int(termkey_getkey(tk, &key), TERMKEY_RES_NONE, "getkey yields RES_NONE when empty"); + is_int (termkey_getkey (tk, &key), TERMKEY_RES_NONE, + "getkey yields RES_NONE when empty"); - write(fd[1], "h", 1); + write (fd[1], "h", 1); - is_int(termkey_getkey(tk, &key), TERMKEY_RES_NONE, "getkey yields RES_NONE before advisereadable"); + is_int (termkey_getkey (tk, &key), TERMKEY_RES_NONE, + "getkey yields RES_NONE before advisereadable"); - is_int(termkey_advisereadable(tk), TERMKEY_RES_AGAIN, "advisereadable yields RES_AGAIN after h"); + is_int (termkey_advisereadable (tk), TERMKEY_RES_AGAIN, + "advisereadable yields RES_AGAIN after h"); - is_int(termkey_get_buffer_remaining(tk), 255, "buffer free 255 after advisereadable"); + is_int (termkey_get_buffer_remaining (tk), 255, + "buffer free 255 after advisereadable"); - 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.code.codepoint, 'h', "key.code.codepoint after h"); - is_int(key.modifiers, 0, "key.modifiers after h"); - is_str(key.utf8, "h", "key.utf8 after h"); + is_int (key.type, TERMKEY_TYPE_KEY, "key.type after h"); + is_int (key.code.codepoint, 'h', "key.code.codepoint after h"); + is_int (key.modifiers, 0, "key.modifiers after h"); + is_str (key.multibyte, "h", "key.multibyte after h"); - is_int(termkey_get_buffer_remaining(tk), 256, "buffer free 256 after getkey"); + is_int (termkey_get_buffer_remaining (tk), 256, + "buffer free 256 after getkey"); - is_int(termkey_getkey(tk, &key), TERMKEY_RES_NONE, "getkey yields RES_NONE a second time"); + is_int (termkey_getkey (tk, &key), TERMKEY_RES_NONE, + "getkey yields RES_NONE a second time"); - write(fd[1], "\033O", 2); - termkey_advisereadable(tk); + write (fd[1], "\033O", 2); + termkey_advisereadable (tk); - is_int(termkey_get_buffer_remaining(tk), 254, "buffer free 254 after partial write"); + is_int (termkey_get_buffer_remaining (tk), 254, + "buffer free 254 after partial write"); - is_int(termkey_getkey(tk, &key), TERMKEY_RES_AGAIN, "getkey yields RES_AGAIN after partial write"); + is_int (termkey_getkey (tk, &key), TERMKEY_RES_AGAIN, + "getkey yields RES_AGAIN after partial write"); - write(fd[1], "C", 1); - termkey_advisereadable(tk); + write (fd[1], "C", 1); + termkey_advisereadable (tk); - is_int(termkey_getkey(tk, &key), TERMKEY_RES_KEY, "getkey yields RES_KEY after Right completion"); + is_int (termkey_getkey (tk, &key), TERMKEY_RES_KEY, + "getkey yields RES_KEY after Right completion"); - is_int(key.type, TERMKEY_TYPE_KEYSYM, "key.type after Right"); - is_int(key.code.sym, TERMKEY_SYM_RIGHT, "key.code.sym after Right"); - is_int(key.modifiers, 0, "key.modifiers after Right"); + is_int (key.type, TERMKEY_TYPE_KEYSYM, "key.type after Right"); + is_int (key.code.sym, TERMKEY_SYM_RIGHT, "key.code.sym after Right"); + is_int (key.modifiers, 0, "key.modifiers after Right"); - is_int(termkey_get_buffer_remaining(tk), 256, "buffer free 256 after completion"); + is_int (termkey_get_buffer_remaining (tk), 256, + "buffer free 256 after completion"); - termkey_stop(tk); + termkey_stop (tk); - is_int(termkey_getkey(tk, &key), TERMKEY_RES_ERROR, "getkey yields RES_ERROR after termkey_stop()"); - is_int(errno, EINVAL, "getkey error is EINVAL"); + is_int (termkey_getkey (tk, &key), TERMKEY_RES_ERROR, + "getkey yields RES_ERROR after termkey_stop ()"); + is_int (errno, EINVAL, "getkey error is EINVAL"); - termkey_destroy(tk); - - return exit_status(); + termkey_destroy (tk); + return exit_status (); } -- cgit v1.2.3-54-g00ecf