stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1f7f7297e36db8e01b1035cf2a9e6c30e5dfe91b
commit 1f7f7297e36db8e01b1035cf2a9e6c30e5dfe91b
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Fri Mar 30 11:11:57 2018 -0400
tests: rework strbuf append/prepend tests
there's no point in iterating this many times; the base step size is 32
and so each loop will only increase the buffer...not at all since it takes
3 loops for the buffer to increase by the step size
verify that the buffer increases and then stop instead of spinning uselessly
fix T6835
Reviewed-by: Stefan Schmidt <ste...@osg.samsung.com>
---
src/tests/eina/eina_test_strbuf.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/tests/eina/eina_test_strbuf.c
b/src/tests/eina/eina_test_strbuf.c
index 75c007b025..8c265b0674 100644
--- a/src/tests/eina/eina_test_strbuf.c
+++ b/src/tests/eina/eina_test_strbuf.c
@@ -372,7 +372,7 @@ EFL_END_TEST
EFL_START_TEST(eina_test_strbuf_append_realloc)
{
Eina_Strbuf *buf;
- const size_t runs = 40960;
+ const size_t runs = 3 * 10;
const char target_pattern[] = "stringstrsstr";
const char *str;
size_t i, target_pattern_size;
@@ -382,19 +382,19 @@ EFL_START_TEST(eina_test_strbuf_append_realloc)
for (i = 0; i < runs; i++)
{
- fail_if(!eina_strbuf_append(buf, "string"));
- fail_if(!eina_strbuf_append_n(buf, "string", 3));
- fail_if(!eina_strbuf_append_char(buf, 's'));
- fail_if(!eina_strbuf_append_length(buf, "string", 3));
+ ck_assert_int_ne(eina_strbuf_append(buf, "string"), 0); //6
+ ck_assert_int_ne(eina_strbuf_append_n(buf, "string", 3), 0); //3
+ ck_assert_int_ne(eina_strbuf_append_char(buf, 's'), 0); //1
+ ck_assert_int_ne(eina_strbuf_append_length(buf, "string", 3), 0); //3
}
target_pattern_size = strlen(target_pattern);
ck_assert_int_eq(eina_strbuf_length_get(buf), runs * target_pattern_size);
str = eina_strbuf_string_get(buf);
- fail_if(str == NULL);
+ ck_assert_ptr_nonnull(str);
for (i = 0; i < runs; i++, str += target_pattern_size)
- fail_if(memcmp(str, target_pattern, target_pattern_size));
+ ck_assert_int_eq(memcmp(str, target_pattern, target_pattern_size), 0);
eina_strbuf_free(buf);
}
@@ -403,7 +403,7 @@ EFL_END_TEST
EFL_START_TEST(eina_test_strbuf_prepend_realloc)
{
Eina_Strbuf *buf;
- const size_t runs = 40960;
+ const size_t runs = 3 * 10;
const char target_pattern[] = "strsstrstring";
const char *str;
size_t i, target_pattern_size;
@@ -413,19 +413,19 @@ EFL_START_TEST(eina_test_strbuf_prepend_realloc)
for (i = 0; i < runs; i++)
{
- fail_if(!eina_strbuf_prepend(buf, "string"));
- fail_if(!eina_strbuf_prepend_n(buf, "string", 3));
- fail_if(!eina_strbuf_prepend_char(buf, 's'));
- fail_if(!eina_strbuf_prepend_length(buf, "string", 3));
+ ck_assert_int_ne(eina_strbuf_prepend(buf, "string"), 0); //6
+ ck_assert_int_ne(eina_strbuf_prepend_n(buf, "string", 3), 0); //3
+ ck_assert_int_ne(eina_strbuf_prepend_char(buf, 's'), 0); //1
+ ck_assert_int_ne(eina_strbuf_prepend_length(buf, "string", 3), 0); //3
}
target_pattern_size = strlen(target_pattern);
- fail_if(eina_strbuf_length_get(buf) != (runs * target_pattern_size));
+ ck_assert_int_eq(eina_strbuf_length_get(buf), runs * target_pattern_size);
str = eina_strbuf_string_get(buf);
- fail_if(str == NULL);
+ ck_assert_ptr_nonnull(str);
for (i = 0; i < runs; i++, str += target_pattern_size)
- fail_if(memcmp(str, target_pattern, target_pattern_size));
+ ck_assert_int_eq(memcmp(str, target_pattern, target_pattern_size), 0);
eina_strbuf_free(buf);
}
--
