From: Enlightenment S. <no-...@en...> - 2012-06-08 23:28:44
|
Log: fix the str_split test to function the way our docs specify that it should Author: discomfitor Date: 2012-06-08 16:28:37 -0700 (Fri, 08 Jun 2012) New Revision: 71872 Trac: http://trac.enlightenment.org/e/changeset/71872 Modified: trunk/eina/src/tests/eina_test_str.c Modified: trunk/eina/src/tests/eina_test_str.c =================================================================== --- trunk/eina/src/tests/eina_test_str.c 2012-06-08 23:28:11 UTC (rev 71871) +++ trunk/eina/src/tests/eina_test_str.c 2012-06-08 23:28:37 UTC (rev 71872) @@ -96,76 +96,82 @@ result = eina_str_split_full("nomatch", "x", -1, &elements); fail_if(result == NULL); - fail_if(elements != 1); + fail_if(elements != 2); fail_if(strcmp(result[0], "nomatch") != 0); + fail_if(result[1]); free(result[0]); free(result); result = eina_str_split_full("nomatch", "xyz", -1, &elements); fail_if(result == NULL); - fail_if(elements != 1); + fail_if(elements != 2); fail_if(strcmp(result[0], "nomatch") != 0); + fail_if(result[1]); free(result[0]); free(result); result = eina_str_split_full("match:match:match", ":", -1, &elements); fail_if(result == NULL); - fail_if(elements != 3); - while (elements >= 1) - { - elements--; - fail_if(strcmp(result[elements], "match") != 0); - } + fail_if(elements != 4); + for (elements = 0; elements < 4 - 1; elements++) + fail_if(strcmp(result[elements], "match") != 0); + fail_if(result[3]); free(result[0]); free(result); result = eina_str_split_full("a:b:c", ":", -1, &elements); fail_if(result == NULL); - fail_if(elements != 3); + fail_if(elements != 4); fail_if(strcmp(result[0], "a") != 0); fail_if(strcmp(result[1], "b") != 0); fail_if(strcmp(result[2], "c") != 0); + fail_if(result[3]); free(result[0]); free(result); result = eina_str_split_full("a:b:", ":", -1, &elements); fail_if(result == NULL); - fail_if(elements != 3); + fail_if(elements != 4); fail_if(strcmp(result[0], "a") != 0); fail_if(strcmp(result[1], "b") != 0); fail_if(strcmp(result[2], "") != 0); + fail_if(result[3]); free(result[0]); free(result); result = eina_str_split_full(":b:c", ":", -1, &elements); fail_if(result == NULL); - fail_if(elements != 3); + fail_if(elements != 4); fail_if(strcmp(result[0], "") != 0); fail_if(strcmp(result[1], "b") != 0); fail_if(strcmp(result[2], "c") != 0); + fail_if(result[3]); free(result[0]); free(result); result = eina_str_split_full(":", ":", -1, &elements); fail_if(result == NULL); - fail_if(elements != 2); + fail_if(elements != 3); fail_if(strcmp(result[0], "") != 0); fail_if(strcmp(result[1], "") != 0); + fail_if(result[2]); free(result[0]); free(result); result = eina_str_split_full("a", "!!!!!!!!!", -1, &elements); fail_if(result == NULL); - fail_if(elements != 1); + fail_if(elements != 2); fail_if(strcmp(result[0], "a") != 0); + fail_if(result[1]); free(result[0]); free(result); result = eina_str_split_full("aaba", "ab", -1, &elements); fail_if(result == NULL); - fail_if(elements != 2); + fail_if(elements != 3); fail_if(strcmp(result[0], "a") != 0); fail_if(strcmp(result[1], "a") != 0); + fail_if(result[2]); free(result[0]); free(result); |