about summary refs log tree commit diff stats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/helpers.c18
-rw-r--r--tests/helpers.h2
-rw-r--r--tests/test_history.c219
-rw-r--r--tests/test_history.h13
-rw-r--r--tests/test_keyhandlers.c734
-rw-r--r--tests/test_keyhandlers.h47
-rw-r--r--tests/testsuite.c15
-rw-r--r--tests/ui/stub_ui.c11
8 files changed, 811 insertions, 248 deletions
diff --git a/tests/helpers.c b/tests/helpers.c
index 10310886..564b2716 100644
--- a/tests/helpers.c
+++ b/tests/helpers.c
@@ -85,6 +85,24 @@ void close_chat_sessions(void **state)
     close_preferences(NULL);
 }
 
+int
+utf8_pos_to_col(char *str, int utf8_pos)
+{
+    int col = 0;
+
+    int i = 0;
+    for (i = 0; i<utf8_pos; i++) {
+        col++;
+        gchar *ch = g_utf8_offset_to_pointer(str, i);
+        gunichar uni = g_utf8_get_char(ch);
+        if (g_unichar_iswide(uni)) {
+            col++;
+        }
+    }
+
+    return col;
+}
+
 static GCompareFunc cmp_func;
 
 void
diff --git a/tests/helpers.h b/tests/helpers.h
index 2d7af6e7..75d446d0 100644
--- a/tests/helpers.h
+++ b/tests/helpers.h
@@ -6,5 +6,7 @@ void close_preferences(void **state);
 void init_chat_sessions(void **state);
 void close_chat_sessions(void **state);
 
+int utf8_pos_to_col(char *str, int utf8_pos);
+
 void glist_set_cmp(GCompareFunc func);
 int glist_contents_equal(const void *actual, const void *expected);
\ No newline at end of file
diff --git a/tests/test_history.c b/tests/test_history.c
deleted file mode 100644
index 1584b390..00000000
--- a/tests/test_history.c
+++ /dev/null
@@ -1,219 +0,0 @@
-#include <stdarg.h>
-#include <stddef.h>
-#include <setjmp.h>
-#include <cmocka.h>
-#include <stdlib.h>
-
-#include "tools/history.h"
-
-void previous_on_empty_returns_null(void **state)
-{
-    History history = history_new(10);
-    char *item = history_previous(history, "inp");
-
-    assert_null(item);
-}
-
-void next_on_empty_returns_null(void **state)
-{
-    History history = history_new(10);
-    char *item = history_next(history, "inp");
-
-    assert_null(item);
-}
-
-void previous_once_returns_last(void **state)
-{
-    History history = history_new(10);
-    history_append(history, "Hello");
-
-    char *item = history_previous(history, "inp");
-
-    assert_string_equal("Hello", item);
-}
-
-void previous_twice_when_one_returns_first(void **state)
-{
-    History history = history_new(10);
-    history_append(history, "Hello");
-
-    char *item1 = history_previous(history, NULL);
-    char *item2 = history_previous(history, item1);
-
-    assert_string_equal("Hello", item2);
-}
-
-void previous_always_stops_at_first(void **state)
-{
-    History history = history_new(10);
-    history_append(history, "Hello");
-
-    char *item1 = history_previous(history, NULL);
-    char *item2 = history_previous(history, item1);
-    char *item3 = history_previous(history, item2);
-    char *item4 = history_previous(history, item3);
-    char *item5 = history_previous(history, item4);
-    char *item6 = history_previous(history, item5);
-
-    assert_string_equal("Hello", item6);
-}
-
-void previous_goes_to_correct_element(void **state)
-{
-    History history = history_new(10);
-    history_append(history, "Hello");
-    history_append(history, "world");
-    history_append(history, "whats");
-    history_append(history, "going");
-    history_append(history, "on");
-    history_append(history, "here");
-
-    char *item1 = history_previous(history, NULL);
-    char *item2 = history_previous(history, item1);
-    char *item3 = history_previous(history, item2);
-
-    assert_string_equal("going", item3);
-}
-
-void prev_then_next_returns_empty(void **state)
-{
-    History history = history_new(10);
-    history_append(history, "Hello");
-
-    char *item1 = history_previous(history, NULL);
-    char *item2 = history_next(history, item1);
-
-    assert_string_equal("", item2);
-}
-
-void prev_with_val_then_next_returns_val(void **state)
-{
-    History history = history_new(10);
-    history_append(history, "Hello");
-
-    char *item1 = history_previous(history, "Oioi");
-    char *item2 = history_next(history, item1);
-
-    assert_string_equal("Oioi", item2);
-}
-
-void prev_with_val_then_next_twice_returns_null(void **state)
-{
-    History history = history_new(10);
-    history_append(history, "Hello");
-
-    char *item1 = history_previous(history, "Oioi");
-    char *item2 = history_next(history, item1);
-    char *item3 = history_next(history, item2);
-
-    assert_null(item3);
-}
-
-void navigate_then_append_new(void **state)
-{
-    History history = history_new(10);
-    history_append(history, "Hello");
-    history_append(history, "again");
-    history_append(history, "testing");
-    history_append(history, "history");
-    history_append(history, "append");
-
-    char *item1 = history_previous(history, "new text");
-    assert_string_equal("append", item1);
-
-    char *item2 = history_previous(history, item1);
-    assert_string_equal("history", item2);
-
-    char *item3 = history_previous(history, item2);
-    assert_string_equal("testing", item3);
-
-    char *item4 = history_next(history, item3);
-    assert_string_equal("history", item4);
-
-    char *item5 = history_next(history, item4);
-    assert_string_equal("append", item5);
-
-    char *item6 = history_next(history, item5);
-    assert_string_equal("new text", item6);
-}
-
-void edit_item_mid_history(void **state)
-{
-    History history = history_new(10);
-    history_append(history, "Hello");
-    history_append(history, "again");
-    history_append(history, "testing");
-    history_append(history, "history");
-    history_append(history, "append");
-
-    char *item1 = history_previous(history, "new item");
-    assert_string_equal("append", item1);
-
-    char *item2 = history_previous(history, item1);
-    assert_string_equal("history", item2);
-
-    char *item3 = history_previous(history, item2);
-    assert_string_equal("testing", item3);
-
-    char *item4 = history_previous(history, "EDITED");
-    assert_string_equal("again", item4);
-
-    char *item5 = history_previous(history, item4);
-    assert_string_equal("Hello", item5);
-
-    char *item6 = history_next(history, item5);
-    assert_string_equal("again", item6);
-
-    char *item7 = history_next(history, item6);
-    assert_string_equal("EDITED", item7);
-
-    char *item8 = history_next(history, item7);
-    assert_string_equal("history", item8);
-
-    char *item9 = history_next(history, item8);
-    assert_string_equal("append", item9);
-
-    char *item10 = history_next(history, item9);
-    assert_string_equal("new item", item10);
-}
-
-void edit_previous_and_append(void **state)
-{
-    History history = history_new(10);
-    history_append(history, "Hello");
-    history_append(history, "again");
-    history_append(history, "testing");
-    history_append(history, "history");
-    history_append(history, "append");
-
-    char *item1 = history_previous(history, "new item");
-    assert_string_equal("append", item1);
-
-    char *item2 = history_previous(history, item1);
-    assert_string_equal("history", item2);
-
-    char *item3 = history_previous(history, item2);
-    assert_string_equal("testing", item3);
-
-    history_append(history, "EDITED");
-
-    char *item4 = history_previous(history, NULL);
-    assert_string_equal("EDITED", item4);
-}
-
-void start_session_add_new_submit_previous(void **state)
-{
-    History history = history_new(10);
-    history_append(history, "hello");
-
-    char *item1 = history_previous(history, NULL);
-    assert_string_equal("hello", item1);
-
-    char *item2 = history_next(history, item1);
-    assert_string_equal("", item2);
-
-    char *item3 = history_previous(history, "new text");
-    assert_string_equal("hello", item3);
-
-    history_append(history, item3);
-}
diff --git a/tests/test_history.h b/tests/test_history.h
deleted file mode 100644
index e6e8ec3f..00000000
--- a/tests/test_history.h
+++ /dev/null
@@ -1,13 +0,0 @@
-void previous_on_empty_returns_null(void **state);
-void next_on_empty_returns_null(void **state);
-void previous_once_returns_last(void **state);
-void previous_twice_when_one_returns_first(void **state);
-void previous_always_stops_at_first(void **state);
-void previous_goes_to_correct_element(void **state);
-void prev_then_next_returns_empty(void **state);
-void prev_with_val_then_next_returns_val(void **state);
-void prev_with_val_then_next_twice_returns_null(void **state);
-void navigate_then_append_new(void **state);
-void edit_item_mid_history(void **state);
-void edit_previous_and_append(void **state);
-void start_session_add_new_submit_previous(void **state);
diff --git a/tests/test_keyhandlers.c b/tests/test_keyhandlers.c
new file mode 100644
index 00000000..a6d39143
--- /dev/null
+++ b/tests/test_keyhandlers.c
@@ -0,0 +1,734 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <locale.h>
+
+#include "ui/keyhandlers.h"
+#include "ui/inputwin.h"
+#include "tests/helpers.h"
+
+static char line[INP_WIN_MAX];
+
+// append
+
+void append_to_empty(void **state)
+{
+    setlocale(LC_ALL, "");
+    line[0] = '\0';
+    int line_utf8_pos = 0;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_printable(line, &line_utf8_pos, &col, &pad_start, 'a', 80);
+
+    assert_string_equal("a", line);
+    assert_int_equal(line_utf8_pos, 1);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void append_wide_to_empty(void **state)
+{
+    setlocale(LC_ALL, "");
+    line[0] = '\0';
+    int line_utf8_pos = 0;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_printable(line, &line_utf8_pos, &col, &pad_start, 0x56DB, 80);
+
+    assert_string_equal("四", line);
+    assert_int_equal(line_utf8_pos, 1);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void append_to_single(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "a", 1);
+    line[1] = '\0';
+    int line_utf8_pos = 1;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_printable(line, &line_utf8_pos, &col, &pad_start, 'b', 80);
+
+    assert_string_equal("ab", line);
+    assert_int_equal(line_utf8_pos, 2);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+
+void append_wide_to_single_non_wide(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "a", 1);
+    line[1] = '\0';
+    int line_utf8_pos = 1;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_printable(line, &line_utf8_pos, &col, &pad_start, 0x56DB, 80);
+
+    assert_string_equal("a四", line);
+    assert_int_equal(line_utf8_pos, 2);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void append_non_wide_to_single_wide(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "四", 1);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 1;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_printable(line, &line_utf8_pos, &col, &pad_start, 'b', 80);
+
+    assert_string_equal("四b", line);
+    assert_int_equal(line_utf8_pos, 2);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void append_wide_to_single_wide(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "四", 1);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 1;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_printable(line, &line_utf8_pos, &col, &pad_start, 0x4E09, 80);
+
+    assert_string_equal("四三", line);
+    assert_int_equal(line_utf8_pos, 2);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void append_non_wide_when_overrun(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "0123456789四1234567", 18);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 18;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_printable(line, &line_utf8_pos, &col, &pad_start, 'z', 20);
+    key_printable(line, &line_utf8_pos, &col, &pad_start, 'z', 20);
+    key_printable(line, &line_utf8_pos, &col, &pad_start, 'z', 20);
+
+    assert_string_equal("0123456789四1234567zzz", line);
+    assert_int_equal(line_utf8_pos, 21);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 3);
+}
+
+void insert_non_wide_to_non_wide(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "abcd", 4);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 2;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_printable(line, &line_utf8_pos, &col, &pad_start, '0', 80);
+
+    assert_string_equal("ab0cd", line);
+    assert_int_equal(line_utf8_pos, 3);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void insert_single_non_wide_when_pad_scrolled(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "AAAAAAAAAAAAAAA", 15);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 2;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 2;
+
+    key_printable(line, &line_utf8_pos, &col, &pad_start, 'B', 12);
+
+    assert_string_equal("AABAAAAAAAAAAAAA", line);
+    assert_int_equal(line_utf8_pos, 3);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 2);
+}
+
+void insert_many_non_wide_when_pad_scrolled(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "AAAAAAAAAAAAAAA", 15);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 2;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 2;
+
+    key_printable(line, &line_utf8_pos, &col, &pad_start, 'B', 12);
+    key_printable(line, &line_utf8_pos, &col, &pad_start, 'C', 12);
+    key_printable(line, &line_utf8_pos, &col, &pad_start, 'D', 12);
+
+    assert_string_equal("AABCDAAAAAAAAAAAAA", line);
+    assert_int_equal(line_utf8_pos, 5);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 2);
+}
+
+void insert_single_non_wide_last_column(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "abcdefghijklmno", 15);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 7;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 2;
+
+    key_printable(line, &line_utf8_pos, &col, &pad_start, '1', 5);
+
+    assert_string_equal("abcdefg1hijklmno", line);
+    assert_int_equal(line_utf8_pos, 8);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 3);
+}
+
+void insert_many_non_wide_last_column(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "abcdefghijklmno", 15);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 7;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 2;
+
+    key_printable(line, &line_utf8_pos, &col, &pad_start, '1', 5);
+    key_printable(line, &line_utf8_pos, &col, &pad_start, '2', 5);
+
+    assert_string_equal("abcdefg12hijklmno", line);
+    assert_int_equal(line_utf8_pos, 9);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 4);
+}
+
+void ctrl_left_when_no_input(void **state)
+{
+    setlocale(LC_ALL, "");
+    line[0] = '\0';
+    int line_utf8_pos = 0;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 0);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_when_at_start(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "abcd efghij klmn opqr", 21);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 0;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 0);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_when_in_first_word(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "abcd efghij klmn opqr", 21);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 2;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 0);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_when_in_first_space(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "abcd efghij klmn opqr", 21);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 4;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 0);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_when_at_start_of_second_word(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "abcd efghij klmn opqr", 21);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 5;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 0);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_when_in_second_word(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "abcd efghij klmn opqr", 21);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 8;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 5);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_when_at_end_of_second_word(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "abcd efghij klmn opqr", 21);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 10;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 5);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_when_in_second_space(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "abcd efghij klmn opqr", 21);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 11;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 5);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_when_at_start_of_third_word(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "abcd efghij klmn opqr", 21);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 12;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 5);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_when_in_third_word(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "abcd efghij klmn opqr", 21);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 14;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 12);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_when_at_end_of_third_word(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "abcd efghij klmn opqr", 21);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 15;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 12);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_when_in_third_space(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "abcd efghij klmn opqr", 21);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 16;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 12);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_when_at_end(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "abcd efghij klmn opqr", 21);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 20;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 17);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_when_in_only_whitespace(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "       ", 7);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 5;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 0);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_when_start_whitespace_start_of_word(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "    hello", 9);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 4;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 0);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_when_start_whitespace_middle_of_word(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "    hello", 9);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 7;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 4);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_in_whitespace_between_words(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "hey    hello", 12);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 5;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 0);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_in_whitespace_between_words_start_of_word(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "hey    hello", 12);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 7;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 0);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_in_whitespace_between_words_middle_of_word(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "hey    hello", 12);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 9;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 7);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_left_when_word_overrun_to_left(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "someword anotherword", 20);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 18;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 14;
+
+    key_ctrl_left(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 9);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 9);
+}
+
+void ctrl_right_when_no_input(void **state)
+{
+    setlocale(LC_ALL, "");
+    line[0] = '\0';
+    int line_utf8_pos = 0;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_right(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 0);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_right_when_at_end(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "someword anotherword", 20);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 20;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_right(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 20);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_right_one_word_at_start(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "someword", 8);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 0;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_right(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 8);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_right_one_word_in_middle(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "someword", 8);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 3;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_right(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 8);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_right_one_word_at_end(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "someword", 8);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 7;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_right(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 8);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_right_two_words_from_middle_first(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "someword anotherword", 20);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 4;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_right(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 8);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_right_two_words_from_end_first(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "someword anotherword", 20);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 7;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_right(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 8);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_right_two_words_from_space(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "someword anotherword", 20);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 8;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_right(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 20);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_right_two_words_from_start_second(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "someword anotherword", 20);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 9;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_right(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 20);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_right_one_word_leading_whitespace(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "       someword", 15);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 3;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_right(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 15);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_right_two_words_in_whitespace(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "       someword        adfasdf", 30);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 19;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_right(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 30);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
+
+void ctrl_right_trailing_whitespace_from_middle(void **state)
+{
+    setlocale(LC_ALL, "");
+    g_utf8_strncpy(line, "someword        ", 16);
+    line[strlen(line)] = '\0';
+    int line_utf8_pos = 3;
+    int col = utf8_pos_to_col(line, line_utf8_pos);
+    int pad_start = 0;
+
+    key_ctrl_right(line, &line_utf8_pos, &col, &pad_start, 80);
+
+    assert_int_equal(line_utf8_pos, 8);
+    assert_int_equal(col, utf8_pos_to_col(line, line_utf8_pos));
+    assert_int_equal(pad_start, 0);
+}
\ No newline at end of file
diff --git a/tests/test_keyhandlers.h b/tests/test_keyhandlers.h
new file mode 100644
index 00000000..4be429a9
--- /dev/null
+++ b/tests/test_keyhandlers.h
@@ -0,0 +1,47 @@
+void append_to_empty(void **state);
+void append_wide_to_empty(void **state);
+void append_to_single(void **state);
+void append_wide_to_single_non_wide(void **state);
+void append_non_wide_to_single_wide(void **state);
+void append_wide_to_single_wide(void **state);
+void append_non_wide_when_overrun(void **state);
+
+void insert_non_wide_to_non_wide(void **state);
+void insert_single_non_wide_when_pad_scrolled(void **state);
+void insert_many_non_wide_when_pad_scrolled(void **state);
+void insert_single_non_wide_last_column(void **state);
+void insert_many_non_wide_last_column(void **state);
+
+void ctrl_left_when_no_input(void **state);
+void ctrl_left_when_at_start(void **state);
+void ctrl_left_when_in_first_word(void **state);
+void ctrl_left_when_in_first_space(void **state);
+void ctrl_left_when_at_start_of_second_word(void **state);
+void ctrl_left_when_in_second_word(void **state);
+void ctrl_left_when_at_end_of_second_word(void **state);
+void ctrl_left_when_in_second_space(void **state);
+void ctrl_left_when_at_start_of_third_word(void **state);
+void ctrl_left_when_in_third_word(void **state);
+void ctrl_left_when_at_end_of_third_word(void **state);
+void ctrl_left_when_in_third_space(void **state);
+void ctrl_left_when_at_end(void **state);
+void ctrl_left_when_in_only_whitespace(void **state);
+void ctrl_left_when_start_whitespace_start_of_word(void **state);
+void ctrl_left_when_start_whitespace_middle_of_word(void **state);
+void ctrl_left_in_whitespace_between_words(void **state);
+void ctrl_left_in_whitespace_between_words_start_of_word(void **state);
+void ctrl_left_in_whitespace_between_words_middle_of_word(void **state);
+void ctrl_left_when_word_overrun_to_left(void **state);
+
+void ctrl_right_when_no_input(void **state);
+void ctrl_right_when_at_end(void **state);
+void ctrl_right_one_word_at_start(void **state);
+void ctrl_right_one_word_in_middle(void **state);
+void ctrl_right_one_word_at_end(void **state);
+void ctrl_right_two_words_from_middle_first(void **state);
+void ctrl_right_two_words_from_end_first(void **state);
+void ctrl_right_two_words_from_space(void **state);
+void ctrl_right_two_words_from_start_second(void **state);
+void ctrl_right_one_word_leading_whitespace(void **state);
+void ctrl_right_two_words_in_whitespace(void **state);
+void ctrl_right_trailing_whitespace_from_middle(void **state);
\ No newline at end of file
diff --git a/tests/testsuite.c b/tests/testsuite.c
index 645a1a40..78d7b570 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -21,7 +21,6 @@
 #include "test_cmd_sub.h"
 #include "test_cmd_statuses.h"
 #include "test_cmd_otr.h"
-#include "test_history.h"
 #include "test_jid.h"
 #include "test_parser.h"
 #include "test_roster_list.h"
@@ -107,20 +106,6 @@ int main(int argc, char* argv[]) {
         unit_test(add_two_same_adds_one),
         unit_test(add_two_same_updates),
 
-        unit_test(previous_on_empty_returns_null),
-        unit_test(next_on_empty_returns_null),
-        unit_test(previous_once_returns_last),
-        unit_test(previous_twice_when_one_returns_first),
-        unit_test(previous_always_stops_at_first),
-        unit_test(previous_goes_to_correct_element),
-        unit_test(prev_then_next_returns_empty),
-        unit_test(prev_with_val_then_next_returns_val),
-        unit_test(prev_with_val_then_next_twice_returns_null),
-        unit_test(navigate_then_append_new),
-        unit_test(edit_item_mid_history),
-        unit_test(edit_previous_and_append),
-        unit_test(start_session_add_new_submit_previous),
-
         unit_test(create_jid_from_null_returns_null),
         unit_test(create_jid_from_empty_string_returns_null),
         unit_test(create_jid_from_full_returns_full),
diff --git a/tests/ui/stub_ui.c b/tests/ui/stub_ui.c
index 51b82d42..2d67a543 100644
--- a/tests/ui/stub_ui.c
+++ b/tests/ui/stub_ui.c
@@ -91,6 +91,7 @@ void ui_smp_answer_failure(const char * const barejid) {}
 
 void ui_otr_authenticating(const char * const barejid) {}
 void ui_otr_authetication_waiting(const char * const recipient) {}
+void ui_sigwinch_handler(int sig) {}
 
 unsigned long ui_get_idle_time(void)
 {
@@ -178,6 +179,11 @@ int ui_win_unread(int index)
     return 0;
 }
 
+void ui_page_up(void) {}
+void ui_page_down(void) {}
+void ui_subwin_page_up(void) {}
+void ui_subwin_page_down(void) {}
+
 char * ui_ask_password(void)
 {
     return mock_ptr_type(char *);
@@ -323,7 +329,7 @@ void ui_update_presence(const resource_presence_t resource_presence,
 void ui_about(void) {}
 void ui_statusbar_new(const int win) {}
 
-char * ui_readline(void)
+char*  ui_readline(void)
 {
     return NULL;
 }
@@ -348,6 +354,9 @@ gboolean ui_win_has_unsaved_form(int num)
     return FALSE;
 }
 
+void
+ui_write(char *line, int offset) {}
+
 // console window actions
 
 void cons_show(const char * const msg, ...)