NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

search: Fix issue when text is at end of line 

Tests were wrong, fix and add more
This commit is contained in:
Andy Williams 2015-04-12 16:56:17 +01:00
parent 5e72e7e71e
commit 8c0f74628b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/elm_code/src/lib/elm_code_text.c
View File

@ -56,7 +56,7 @@ elm_code_line_text_strpos(Elm_Code_Line *line, const char *search, int offset)
return ELM_CODE_TEXT_NOT_FOUND;
ptr += offset;
for (c = offset; c < length - strlen(search); c++)
for (c = offset; c <= length - searchlen; c++)
{
if (!strncmp(ptr, search, searchlen))
return c;

5
legacy/elm_code/src/tests/elm_code_test_text.c
View File

@ -46,7 +46,7 @@ START_TEST (elm_code_text_contains_test)
code = elm_code_create();
file = elm_code_file_new(code);
elm_code_file_line_append(file, "a test string...", 17, NULL);
elm_code_file_line_append(file, "a test string...", 16, NULL);
line = elm_code_file_line_get(file, 1);
ck_assert_int_eq(EINA_TRUE, elm_code_line_text_contains(line, "test"));
@ -66,7 +66,7 @@ START_TEST (elm_code_text_strpos_test)
code = elm_code_create();
file = elm_code_file_new(code);
elm_code_file_line_append(file, "a test string...", 17, NULL);
elm_code_file_line_append(file, "a test string...", 16, NULL);
line = elm_code_file_line_get(file, 1);
ck_assert_int_eq(2, elm_code_line_text_strpos(line, "test", 0));
@ -76,6 +76,7 @@ START_TEST (elm_code_text_strpos_test)
ck_assert_int_eq(ELM_CODE_TEXT_NOT_FOUND, elm_code_line_text_strpos(line, "text", 0));
ck_assert_int_eq(0, elm_code_line_text_strpos(line, "a t", 0));
ck_assert_int_eq(ELM_CODE_TEXT_NOT_FOUND, elm_code_line_text_strpos(line, "a t", 2));
ck_assert_int_eq(13, elm_code_line_text_strpos(line, "...", 0));
}
END_TEST