From b4f73017687e896953b2dbd1476ba99d44f0af47 Mon Sep 17 00:00:00 2001 From: Andy Williams Date: Mon, 18 May 2015 19:40:06 +0100 Subject: [PATCH] Fixup tests Fixing compile errors and out of date tests. oops. --- elm_code/src/lib/elm_code_private.h | 2 +- elm_code/src/tests/elm_code_test_text.c | 7 +++++-- elm_code/src/tests/widget/elm_code_test_widget.c | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/elm_code/src/lib/elm_code_private.h b/elm_code/src/lib/elm_code_private.h index 1f16c8f..372f78c 100644 --- a/elm_code/src/lib/elm_code_private.h +++ b/elm_code/src/lib/elm_code_private.h @@ -1,7 +1,7 @@ #ifndef ELM_CODE_PRIVATE_H # define ELM_CODE_PRIVATE_H -extern int _elm_code_lib_log_dom; +int _elm_code_lib_log_dom; #ifdef ERR # undef ERR diff --git a/elm_code/src/tests/elm_code_test_text.c b/elm_code/src/tests/elm_code_test_text.c index 1798433..c291569 100644 --- a/elm_code/src/tests/elm_code_test_text.c +++ b/elm_code/src/tests/elm_code_test_text.c @@ -83,11 +83,14 @@ END_TEST START_TEST (elm_code_text_newline_position_test) { + short nllen; const char *unixtext = "a test\nwith newline"; const char *wintext = "a windows\r\nnewline"; - ck_assert_int_eq(6, elm_code_text_newlinenpos(unixtext, strlen(unixtext))); - ck_assert_int_eq(9, elm_code_text_newlinenpos(wintext, strlen(wintext))); + ck_assert_int_eq(6, elm_code_text_newlinenpos(unixtext, strlen(unixtext), &nllen)); + ck_assert_int_eq(1, nllen); + ck_assert_int_eq(9, elm_code_text_newlinenpos(wintext, strlen(wintext), &nllen)); + ck_assert_int_eq(2, nllen); } END_TEST diff --git a/elm_code/src/tests/widget/elm_code_test_widget.c b/elm_code/src/tests/widget/elm_code_test_widget.c index 54c102c..b2f3d18 100644 --- a/elm_code/src/tests/widget/elm_code_test_widget.c +++ b/elm_code/src/tests/widget/elm_code_test_widget.c @@ -5,6 +5,7 @@ #include "elm_code_suite.h" #include "widget/elm_code_widget.c" +#include "widget/elm_code_widget_tooltip.c" static void _assert_cell_type(Evas_Textgrid_Cell cell, Elm_Code_Token_Type type, int id) {