diff options
Diffstat (limited to 'src/tests/eina/eina_test_iterator.c')
| -rw-r--r-- | src/tests/eina/eina_test_iterator.c | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/src/tests/eina/eina_test_iterator.c b/src/tests/eina/eina_test_iterator.c index 2066269dcc..d71d7ec18e 100644 --- a/src/tests/eina/eina_test_iterator.c +++ b/src/tests/eina/eina_test_iterator.c @@ -39,13 +39,11 @@ _filter(const void *it EINA_UNUSED, void *data, void *fdata) return numb->number % 2; } -START_TEST(eina_iterator_filter_simple) +EFL_START_TEST(eina_iterator_filter_simple) { Eina_Iterator *it, *filtered; Eina_Array *ea; - eina_init(); - ea = eina_array_new(11); fail_if(!ea); @@ -85,9 +83,8 @@ START_TEST(eina_iterator_filter_simple) eina_array_free(ea); - eina_shutdown(); } -END_TEST +EFL_END_TEST struct Free_test { Eina_Bool got_freed; @@ -106,12 +103,11 @@ _free(void *data) test->got_freed = EINA_TRUE; } -START_TEST(eina_iterator_filter_free) +EFL_START_TEST(eina_iterator_filter_free) { Eina_Iterator *it, *filtered; Eina_Array *ea; struct Free_test *data; - eina_init(); data = calloc(1, sizeof(struct Free_test)); ea = eina_array_new(11); @@ -127,9 +123,8 @@ START_TEST(eina_iterator_filter_free) free(data); - eina_shutdown(); } -END_TEST +EFL_END_TEST static Eina_Bool eina_iterator_array_check(EINA_UNUSED const Eina_Array *array, int *data, int *fdata) @@ -140,15 +135,13 @@ eina_iterator_array_check(EINA_UNUSED const Eina_Array *array, return EINA_TRUE; } -START_TEST(eina_iterator_array_simple) +EFL_START_TEST(eina_iterator_array_simple) { Eina_Iterator *it; Eina_Array *ea; int *tmp; int i; - eina_init(); - ea = eina_array_new(11); fail_if(!ea); @@ -175,9 +168,8 @@ START_TEST(eina_iterator_array_simple) eina_array_free(ea); - eina_shutdown(); } -END_TEST +EFL_END_TEST static Eina_Bool eina_iterator_hash_key_check(const Eina_Hash *hash, @@ -210,13 +202,12 @@ eina_iterator_hash_tuple_check(EINA_UNUSED const Eina_Hash *hash, return EINA_TRUE; } -START_TEST(eina_iterator_hash_simple) +EFL_START_TEST(eina_iterator_hash_simple) { Eina_Iterator *it; Eina_Hash *hash; int array[] = { 1, 42, 7, 8, 6 }; - eina_init(); hash = eina_hash_string_superfast_new(NULL); fail_if(hash == NULL); @@ -241,9 +232,8 @@ START_TEST(eina_iterator_hash_simple) eina_hash_free(hash); - eina_shutdown(); } -END_TEST +EFL_END_TEST typedef struct _Eina_Test_Inlist Eina_Test_Inlist; struct _Eina_Test_Inlist @@ -287,7 +277,7 @@ eina_iterator_inlist_data_check(EINA_UNUSED const Eina_Inlist *in_list, return EINA_TRUE; } -START_TEST(eina_iterator_inlist_simple) +EFL_START_TEST(eina_iterator_inlist_simple) { Eina_Inlist *lst = NULL; Eina_Test_Inlist *tmp; @@ -325,7 +315,7 @@ START_TEST(eina_iterator_inlist_simple) fail_if(i != 5); } -END_TEST +EFL_END_TEST static Eina_Bool eina_iterator_list_data_check(EINA_UNUSED const Eina_List *list, @@ -354,14 +344,13 @@ eina_iterator_list_data_check(EINA_UNUSED const Eina_List *list, return EINA_TRUE; } -START_TEST(eina_iterator_list_simple) +EFL_START_TEST(eina_iterator_list_simple) { Eina_List *list = NULL; Eina_Iterator *it; int data[] = { 6, 9, 42, 1, 7, 1337, 81, 1664 }; int i = 0; - eina_init(); list = eina_list_append(list, &data[0]); fail_if(list == NULL); @@ -390,7 +379,7 @@ START_TEST(eina_iterator_list_simple) eina_iterator_foreach(it, EINA_EACH_CB(eina_iterator_list_data_check), &i); eina_iterator_free(it); } -END_TEST +EFL_END_TEST static Eina_Bool eina_reverse_iterator_list_data_check(EINA_UNUSED const Eina_List *list, @@ -419,14 +408,13 @@ eina_reverse_iterator_list_data_check(EINA_UNUSED const Eina_List *list, return EINA_TRUE; } -START_TEST(eina_reverse_iterator_list_simple) +EFL_START_TEST(eina_reverse_iterator_list_simple) { Eina_List *list = NULL; Eina_Iterator *it; int data[] = { 6, 9, 42, 1, 7, 1337, 81, 1664 }; int i = 0; - eina_init(); list = eina_list_append(list, &data[0]); fail_if(list == NULL); @@ -455,7 +443,7 @@ START_TEST(eina_reverse_iterator_list_simple) eina_iterator_foreach(it, EINA_EACH_CB(eina_reverse_iterator_list_data_check), &i); eina_iterator_free(it); } -END_TEST +EFL_END_TEST typedef struct _Eina_Rbtree_Int Eina_Rbtree_Int; struct _Eina_Rbtree_Int @@ -558,7 +546,7 @@ eina_iterator_rbtree_data_check_postfix(EINA_UNUSED const Eina_List *list, return EINA_TRUE; } -START_TEST(eina_iterator_rbtree_simple) +EFL_START_TEST(eina_iterator_rbtree_simple) { Eina_Rbtree *root = NULL; Eina_Iterator *it; @@ -622,7 +610,7 @@ START_TEST(eina_iterator_rbtree_simple) &i); eina_iterator_free(it); } -END_TEST +EFL_END_TEST void eina_test_iterator(TCase *tc) |