summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorAndy Williams <andy@andywilliams.me>2016-06-06 14:14:24 +0100
committerTom Hacohen <tom@stosb.com>2016-06-06 14:28:17 +0100
commit05f0134da47a6a303c445f0abeb019ea431a7089 (patch)
treeb5717a25577fd272a58048f9e0b68e6fe0e5bca0 /src/tests
parent80ca479916419bafd1fe333ed074699903a1b945 (diff)
elementary_code: Fix test failures post-merge
Looks like some were legitimate failures that were not being caught in the previous setup
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/elementary/elm_code_test_parse.c2
-rw-r--r--src/tests/elementary/elm_code_test_widget_selection.c15
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)
47{ 47{
48 Elm_Code *code; 48 Elm_Code *code;
49 Elm_Code_File *file; 49 Elm_Code_File *file;
50 char *path = TESTS_SRC_DIR "testfile.txt"; 50 char *path = TESTS_SRC_DIR "/testfile.txt";
51 51
52 line_calls = 0; 52 line_calls = 0;
53 file_calls = 0; 53 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)
339 Elm_Code_Widget *widget; 339 Elm_Code_Widget *widget;
340 Evas_Object *win; 340 Evas_Object *win;
341 const char *text; 341 const char *text;
342 unsigned int length;
342 343
343 elm_init(1, NULL); 344 elm_init(1, NULL);
344 code = elm_code_create(); 345 code = elm_code_create();
@@ -358,8 +359,8 @@ START_TEST (elm_code_test_widget_selection_delete_twoline)
358 elm_code_widget_selection_delete(widget); 359 elm_code_widget_selection_delete(widget);
359 360
360 line = elm_code_file_line_get(file, 1); 361 line = elm_code_file_line_get(file, 1);
361 text = elm_code_line_text_get(line, NULL); 362 text = elm_code_line_text_get(line, &length);
362 ck_assert_str_eq("teXT", text); 363 ck_assert_strn_eq("teXT", text, length);
363 ck_assert_int_eq(1, elm_code_file_lines_get(file)); 364 ck_assert_int_eq(1, elm_code_file_lines_get(file));
364 365
365 elm_code_free(code); 366 elm_code_free(code);
@@ -411,6 +412,7 @@ START_TEST (elm_code_test_widget_selection_delete_multiline)
411 Elm_Code_Widget *widget; 412 Elm_Code_Widget *widget;
412 Evas_Object *win; 413 Evas_Object *win;
413 const char *text; 414 const char *text;
415 unsigned int length;
414 416
415 elm_init(1, NULL); 417 elm_init(1, NULL);
416 code = elm_code_create(); 418 code = elm_code_create();
@@ -431,8 +433,8 @@ START_TEST (elm_code_test_widget_selection_delete_multiline)
431 elm_code_widget_selection_delete(widget); 433 elm_code_widget_selection_delete(widget);
432 434
433 line = elm_code_file_line_get(file, 1); 435 line = elm_code_file_line_get(file, 1);
434 text = elm_code_line_text_get(line, NULL); 436 text = elm_code_line_text_get(line, &length);
435 ck_assert_str_eq("teXT", text); 437 ck_assert_strn_eq("teXT", text, length);
436 ck_assert_int_eq(1, elm_code_file_lines_get(file)); 438 ck_assert_int_eq(1, elm_code_file_lines_get(file));
437 439
438 elm_code_free(code); 440 elm_code_free(code);
@@ -448,6 +450,7 @@ START_TEST (elm_code_test_widget_selection_reverse_delete_multiline)
448 Elm_Code_Widget *widget; 450 Elm_Code_Widget *widget;
449 Evas_Object *win; 451 Evas_Object *win;
450 const char *text; 452 const char *text;
453 unsigned int length;
451 454
452 elm_init(1, NULL); 455 elm_init(1, NULL);
453 code = elm_code_create(); 456 code = elm_code_create();
@@ -468,8 +471,8 @@ START_TEST (elm_code_test_widget_selection_reverse_delete_multiline)
468 elm_code_widget_selection_delete(widget); 471 elm_code_widget_selection_delete(widget);
469 472
470 line = elm_code_file_line_get(file, 1); 473 line = elm_code_file_line_get(file, 1);
471 text = elm_code_line_text_get(line, NULL); 474 text = elm_code_line_text_get(line, &length);
472 ck_assert_str_eq("teXT", text); 475 ck_assert_strn_eq("teXT", text, length);
473 ck_assert_int_eq(1, elm_code_file_lines_get(file)); 476 ck_assert_int_eq(1, elm_code_file_lines_get(file));
474 477
475 elm_code_free(code); 478 elm_code_free(code);