From 05f0134da47a6a303c445f0abeb019ea431a7089 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Mon, 6 Jun 2016 14:14:24 +0100 Subject: [PATCH] elementary_code: Fix test failures post-merge Looks like some were legitimate failures that were not being caught in the previous setup --- src/tests/elementary/elm_code_test_parse.c | 2 +- .../elementary/elm_code_test_widget_selection.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/tests/elementary/elm_code_test_parse.c b/src/tests/elementary/elm_code_test_parse.c index 4bd35b4b88..fb097c5ac0 100644 --- a/src/tests/elementary/elm_code_test_parse.c +++ b/src/tests/elementary/elm_code_test_parse.c @@ -47,7 +47,7 @@ START_TEST (elm_code_parse_hook_file_test) { Elm_Code *code; Elm_Code_File *file; - char *path = TESTS_SRC_DIR "testfile.txt"; + char *path = TESTS_SRC_DIR "/testfile.txt"; line_calls = 0; file_calls = 0; diff --git a/src/tests/elementary/elm_code_test_widget_selection.c b/src/tests/elementary/elm_code_test_widget_selection.c index e181e6e14d..9cb4b90e33 100644 --- a/src/tests/elementary/elm_code_test_widget_selection.c +++ b/src/tests/elementary/elm_code_test_widget_selection.c @@ -339,6 +339,7 @@ START_TEST (elm_code_test_widget_selection_delete_twoline) Elm_Code_Widget *widget; Evas_Object *win; const char *text; + unsigned int length; elm_init(1, NULL); code = elm_code_create(); @@ -358,8 +359,8 @@ START_TEST (elm_code_test_widget_selection_delete_twoline) elm_code_widget_selection_delete(widget); line = elm_code_file_line_get(file, 1); - text = elm_code_line_text_get(line, NULL); - ck_assert_str_eq("teXT", text); + text = elm_code_line_text_get(line, &length); + ck_assert_strn_eq("teXT", text, length); ck_assert_int_eq(1, elm_code_file_lines_get(file)); elm_code_free(code); @@ -411,6 +412,7 @@ START_TEST (elm_code_test_widget_selection_delete_multiline) Elm_Code_Widget *widget; Evas_Object *win; const char *text; + unsigned int length; elm_init(1, NULL); code = elm_code_create(); @@ -431,8 +433,8 @@ START_TEST (elm_code_test_widget_selection_delete_multiline) elm_code_widget_selection_delete(widget); line = elm_code_file_line_get(file, 1); - text = elm_code_line_text_get(line, NULL); - ck_assert_str_eq("teXT", text); + text = elm_code_line_text_get(line, &length); + ck_assert_strn_eq("teXT", text, length); ck_assert_int_eq(1, elm_code_file_lines_get(file)); elm_code_free(code); @@ -448,6 +450,7 @@ START_TEST (elm_code_test_widget_selection_reverse_delete_multiline) Elm_Code_Widget *widget; Evas_Object *win; const char *text; + unsigned int length; elm_init(1, NULL); code = elm_code_create(); @@ -468,8 +471,8 @@ START_TEST (elm_code_test_widget_selection_reverse_delete_multiline) elm_code_widget_selection_delete(widget); line = elm_code_file_line_get(file, 1); - text = elm_code_line_text_get(line, NULL); - ck_assert_str_eq("teXT", text); + text = elm_code_line_text_get(line, &length); + ck_assert_strn_eq("teXT", text, length); ck_assert_int_eq(1, elm_code_file_lines_get(file)); elm_code_free(code);