devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Added key insert tests, extracted key_ctrl_left handler

Browse Source
This commit is contained in:
James Booth
2015-01-20 23:02:04 +00:00
parent 58239244bb
commit 25d31101bf
6 changed files with 586 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

452
tests/test_keyhandlers.c
View File

@@ -63,7 +63,7 @@ void append_wide_to_empty(void **state)
void append_non_wide_to_non_wide(void **state)
{
setlocale(LC_ALL, "");
strncpy(line, "a", 1);
g_utf8_strncpy(line, "a", 1);
line[1] = '\0';
int line_utf8_pos = 1;
int col = utf8_pos_to_col(line, line_utf8_pos);
@@ -80,7 +80,7 @@ void append_non_wide_to_non_wide(void **state)
void append_wide_to_non_wide(void **state)
{
setlocale(LC_ALL, "");
strncpy(line, "a", 1);
g_utf8_strncpy(line, "a", 1);
line[1] = '\0';
int line_utf8_pos = 1;
int col = utf8_pos_to_col(line, line_utf8_pos);
@@ -128,7 +128,7 @@ void append_wide_to_wide(void **state)
assert_int_equal(pad_start, 0);
}
void append_no_wide_when_overrun(void **state)
void append_non_wide_when_overrun(void **state)
{
setlocale(LC_ALL, "");
g_utf8_strncpy(line, "0123456789四1234567", 18);
@@ -232,4 +232,450 @@ void insert_wide_to_wide(void **state)
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_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, 0x4E09, 12);
assert_string_equal("AA三AAAAAAAAAAAAA", 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_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, 0x304C, 12);
key_printable(line, &line_utf8_pos, &col, &pad_start, 0x304C, 12);
key_printable(line, &line_utf8_pos, &col, &pad_start, 0x4E09, 12);
assert_string_equal("AAがが三AAAAAAAAAAAAA", 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 insert_single_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, 0x4E09, 5);
assert_string_equal("abcdefg三hijklmno", 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, 4);
}
void insert_many_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, 0x4E09, 5);
key_printable(line, &line_utf8_pos, &col, &pad_start, 0x304C, 5);
assert_string_equal("abcdefg三がhijklmno", 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, 6);
}
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);
}

36
tests/test_keyhandlers.h
View File

@@ -1,16 +1,40 @@
void append_non_wide_to_empty(void **state);
void append_wide_to_empty(void **state);
void append_non_wide_to_non_wide(void **state);
void append_wide_to_non_wide(void **state);
void append_non_wide_to_wide(void **state);
void append_wide_to_wide(void **state);
void append_no_wide_when_overrun(void **state);
void append_non_wide_when_overrun(void **state);
void append_wide_when_overrun(void **state);
void insert_non_wide_to_non_wide(void **state);
void insert_wide_to_non_wide(void **state);
void insert_non_wide_to_wide(void **state);
void insert_wide_to_wide(void **state);
void insert_wide_to_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_wide_when_pad_scrolled(void **state);
void insert_many_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 insert_single_wide_last_column(void **state);
void insert_many_wide_last_column(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);

29
tests/testsuite.c
View File

@@ -630,12 +630,39 @@ int main(int argc, char* argv[]) {
unit_test(append_wide_to_non_wide),
unit_test(append_non_wide_to_wide),
unit_test(append_wide_to_wide),
unit_test(append_no_wide_when_overrun),
unit_test(append_non_wide_when_overrun),
unit_test(append_wide_when_overrun),
unit_test(insert_non_wide_to_non_wide),
unit_test(insert_wide_to_non_wide),
unit_test(insert_non_wide_to_wide),
unit_test(insert_wide_to_wide),
unit_test(insert_single_non_wide_when_pad_scrolled),
unit_test(insert_many_non_wide_when_pad_scrolled),
unit_test(insert_single_wide_when_pad_scrolled),
unit_test(insert_many_wide_when_pad_scrolled),
unit_test(insert_single_non_wide_last_column),
unit_test(insert_many_non_wide_last_column),
unit_test(insert_single_wide_last_column),
unit_test(insert_many_wide_last_column),
unit_test(ctrl_left_when_at_start),
unit_test(ctrl_left_when_in_first_word),
unit_test(ctrl_left_when_in_first_space),
unit_test(ctrl_left_when_at_start_of_second_word),
unit_test(ctrl_left_when_in_second_word),
unit_test(ctrl_left_when_at_end_of_second_word),
unit_test(ctrl_left_when_in_second_space),
unit_test(ctrl_left_when_at_start_of_third_word),
unit_test(ctrl_left_when_in_third_word),
unit_test(ctrl_left_when_at_end_of_third_word),
unit_test(ctrl_left_when_in_third_space),
unit_test(ctrl_left_when_at_end),
unit_test(ctrl_left_when_in_only_whitespace),
unit_test(ctrl_left_when_start_whitespace_start_of_word),
unit_test(ctrl_left_when_start_whitespace_middle_of_word),
unit_test(ctrl_left_in_whitespace_between_words),
unit_test(ctrl_left_in_whitespace_between_words_start_of_word),
unit_test(ctrl_left_in_whitespace_between_words_middle_of_word),
unit_test(ctrl_left_when_word_overrun_to_left),
};
return run_tests(all_tests);