ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=60cd21979228482a6245f03d8110aafa2810f5d6
commit 60cd21979228482a6245f03d8110aafa2810f5d6 Author: Andy Williams <[email protected]> Date: Mon Nov 28 01:01:35 2016 +0000 tests: Update for elm_code indent changes --- src/Makefile_Elementary.am | 1 + src/tests/elementary/elm_code_test_indent.c | 43 +++++++++++++++++++++++++++++ src/tests/elementary/elm_code_test_text.c | 42 ---------------------------- src/tests/elementary/elm_suite.c | 19 +++++++------ src/tests/elementary/elm_suite.h | 1 + 5 files changed, 55 insertions(+), 51 deletions(-) diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index 480f683..ee6254b 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -1318,6 +1318,7 @@ tests_elementary_elm_suite_SOURCES = \ tests/elementary/elm_code_test_line.c \ tests/elementary/elm_code_test_parse.c \ tests/elementary/elm_code_test_text.c \ + tests/elementary/elm_code_test_indent.c \ tests/elementary/elm_code_test_widget.c \ tests/elementary/elm_code_test_widget_text.c \ tests/elementary/elm_code_test_widget_selection.c \ diff --git a/src/tests/elementary/elm_code_test_indent.c b/src/tests/elementary/elm_code_test_indent.c new file mode 100644 index 0000000..cf03fa0 --- /dev/null +++ b/src/tests/elementary/elm_code_test_indent.c @@ -0,0 +1,43 @@ +#ifdef HAVE_CONFIG_H +# include "elementary_config.h" +#endif + +#define ELM_INTERNAL_API_ARGESFSDFEFC + +#include "elm_suite.h" +#include "Elementary.h" +#include "elm_code_indent.h" + +START_TEST (elm_code_indent_whitespace_test) +{ + const char *str; + + str = elm_code_line_indent_get("", 0); + ck_assert_str_eq("", str); + str = elm_code_line_indent_get(" ", 2); + ck_assert_str_eq(" ", str); + str = elm_code_line_indent_get("\t", 1); + ck_assert_str_eq("\t", str); + str = elm_code_line_indent_get("\t ", 3); + ck_assert_str_eq("\t ", str); +} +END_TEST + +START_TEST (elm_code_indent_comments_test) +{ + const char *str; + + str = elm_code_line_indent_get(" /**", 4); + ck_assert_str_eq(" * ", str); + str = elm_code_line_indent_get(" * ", 4); + ck_assert_str_eq(" * ", str); + str = elm_code_line_indent_get("\t//", 3); + ck_assert_str_eq("\t//", str); +} +END_TEST + +void elm_code_test_indent(TCase *tc) +{ + tcase_add_test(tc, elm_code_indent_whitespace_test); + tcase_add_test(tc, elm_code_indent_comments_test); +} diff --git a/src/tests/elementary/elm_code_test_text.c b/src/tests/elementary/elm_code_test_text.c index fb198c9..dfff80f 100644 --- a/src/tests/elementary/elm_code_test_text.c +++ b/src/tests/elementary/elm_code_test_text.c @@ -115,46 +115,6 @@ START_TEST (elm_code_text_newline_position_test) } END_TEST -START_TEST (elm_code_text_leading_whitespace_test) -{ - const char *text; - - elm_init(1, NULL); - text = "testing"; - ck_assert_int_eq(0, elm_code_text_leading_whitespace_length(text, strlen(text))); - - text = " spaces"; - ck_assert_int_eq(2, elm_code_text_leading_whitespace_length(text, strlen(text))); - - text = "\t\ttabs"; - ck_assert_int_eq(2, elm_code_text_leading_whitespace_length(text, strlen(text))); - - text = " \t mix"; - ck_assert_int_eq(3, elm_code_text_leading_whitespace_length(text, strlen(text))); - elm_shutdown(); -} -END_TEST - -START_TEST (elm_code_text_trailing_whitespace_test) -{ - const char *text; - - elm_init(1, NULL); - text = "testing"; - ck_assert_int_eq(0, elm_code_text_trailing_whitespace_length(text, strlen(text))); - - text = "spaces "; - ck_assert_int_eq(2, elm_code_text_trailing_whitespace_length(text, strlen(text))); - - text = "tabs\t\t"; - ck_assert_int_eq(2, elm_code_text_trailing_whitespace_length(text, strlen(text))); - - text = "mix \t "; - ck_assert_int_eq(3, elm_code_text_trailing_whitespace_length(text, strlen(text))); - elm_shutdown(); -} -END_TEST - START_TEST (elm_code_text_is_whitespace_test) { const char *text; @@ -179,7 +139,5 @@ void elm_code_test_text(TCase *tc) tcase_add_test(tc, elm_code_text_contains_test); tcase_add_test(tc, elm_code_text_strpos_test); tcase_add_test(tc, elm_code_text_newline_position_test); - tcase_add_test(tc, elm_code_text_leading_whitespace_test); - tcase_add_test(tc, elm_code_text_trailing_whitespace_test); tcase_add_test(tc, elm_code_text_is_whitespace_test); } diff --git a/src/tests/elementary/elm_suite.c b/src/tests/elementary/elm_suite.c index 0507325..146b261 100644 --- a/src/tests/elementary/elm_suite.c +++ b/src/tests/elementary/elm_suite.c @@ -72,15 +72,16 @@ static const Efl_Test_Case etc[] = { { "elm_slideshow", elm_test_slideshow}, { "elm_spinner", elm_test_spinner}, { "elm_plug", elm_test_plug}, - { "file_load", elm_code_file_test_load }, - { "file_memory", elm_code_file_test_memory }, - { "parse", elm_code_test_parse }, - { "text", elm_code_test_text }, - { "basic", elm_code_test_basic }, - { "widget", elm_code_test_widget }, - { "widget_text", elm_code_test_widget_text }, - { "widget_selection", elm_code_test_widget_selection }, - { "widget_undo", elm_code_test_widget_undo }, + { "elm_code_file_load", elm_code_file_test_load }, + { "elm_code_file_memory", elm_code_file_test_memory }, + { "elm_code_parse", elm_code_test_parse }, + { "elm_code_text", elm_code_test_text }, + { "elm_code_indent", elm_code_test_indent }, + { "elm_code_basic", elm_code_test_basic }, + { "elm_code_widget", elm_code_test_widget }, + { "elm_code_widget_text", elm_code_test_widget_text }, + { "elm_code_widget_selection", elm_code_test_widget_selection }, + { "elm_code_widget_undo", elm_code_test_widget_undo }, { NULL, NULL } }; diff --git a/src/tests/elementary/elm_suite.h b/src/tests/elementary/elm_suite.h index 076bb60..e161331 100644 --- a/src/tests/elementary/elm_suite.h +++ b/src/tests/elementary/elm_suite.h @@ -76,6 +76,7 @@ void elm_code_test_basic(TCase *tc); void elm_code_test_line(TCase *tc); void elm_code_test_parse(TCase *tc); void elm_code_test_text(TCase *tc); +void elm_code_test_indent(TCase *tc); void elm_code_test_widget(TCase *tc); void elm_code_test_widget_text(TCase *tc); void elm_code_test_widget_selection(TCase *tc); --
