ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=741bd31b0d9fcc5131bdfd35d3b075b48ccc1a60
commit 741bd31b0d9fcc5131bdfd35d3b075b48ccc1a60 Author: Andy Williams <[email protected]> Date: Wed Nov 19 23:20:23 2014 +0000 Fix a test missed in move to mem-mapping --- elm_code/tests/elm_code_test_widget.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/elm_code/tests/elm_code_test_widget.c b/elm_code/tests/elm_code_test_widget.c index 9f499ac..aa3e537 100644 --- a/elm_code/tests/elm_code_test_widget.c +++ b/elm_code/tests/elm_code_test_widget.c @@ -4,9 +4,9 @@ #include "elm_code_suite.h" -static void _assert_cell_type(Evas_Textgrid_Cell cell, Elm_Code_Token_Type type) +static void _assert_cell_type(Evas_Textgrid_Cell cell, Elm_Code_Token_Type type, int id) { - ck_assert(cell.fg == type); + ck_assert_msg(cell.fg == type, "Wrong type for cell %d", id); } START_TEST (elm_code_widget_token_render_simple_test) @@ -22,18 +22,18 @@ START_TEST (elm_code_widget_token_render_simple_test) file = elm_code_file_new(code); elm_code_file_line_append(file, "some \"test content\", 45"); line = elm_code_file_line_get(file, 1); - length = strlen(line->content); - - elm_code_file_line_token_add(file, 1, 6+1, 18+1, ELM_CODE_TOKEN_TYPE_COMMENT); - elm_code_file_line_token_add(file, 1, 22+1, 23+1, ELM_CODE_TOKEN_TYPE_COMMENT); - - elm_code_widget_fill_line_tokens(cells, length, line); - _assert_cell_type(cells[1], ELM_CODE_TOKEN_TYPE_DEFAULT); - _assert_cell_type(cells[4], ELM_CODE_TOKEN_TYPE_DEFAULT); - _assert_cell_type(cells[6], ELM_CODE_TOKEN_TYPE_DEFAULT); - _assert_cell_type(cells[16], ELM_CODE_TOKEN_TYPE_COMMENT); - _assert_cell_type(cells[20], ELM_CODE_TOKEN_TYPE_DEFAULT); - _assert_cell_type(cells[23], ELM_CODE_TOKEN_TYPE_COMMENT); + length = line->length; + + elm_code_file_line_token_add(file, 1, 6+1, 17+1, ELM_CODE_TOKEN_TYPE_COMMENT); + elm_code_file_line_token_add(file, 1, 21+1, 22+1, ELM_CODE_TOKEN_TYPE_COMMENT); + + elm_code_widget_fill_line_tokens(cells, length+1, line); + _assert_cell_type(cells[1], ELM_CODE_TOKEN_TYPE_DEFAULT, 1); + _assert_cell_type(cells[4], ELM_CODE_TOKEN_TYPE_DEFAULT, 4); + _assert_cell_type(cells[6], ELM_CODE_TOKEN_TYPE_DEFAULT, 6); + _assert_cell_type(cells[16], ELM_CODE_TOKEN_TYPE_COMMENT, 16); + _assert_cell_type(cells[20], ELM_CODE_TOKEN_TYPE_DEFAULT, 20); + _assert_cell_type(cells[23], ELM_CODE_TOKEN_TYPE_COMMENT, 23); elm_code_free(code); } --
