diff options
author | Tom Hacohen <tom@stosb.com> | 2016-03-02 12:10:48 +0000 |
---|---|---|
committer | Tom Hacohen <tom@stosb.com> | 2016-03-03 10:08:27 +0000 |
commit | e74ec8caf2c909f6dd24e1a31ac01242156b0f3f (patch) | |
tree | 79b6492c1168f43105c99bd0d78c43674d99e24f /src/tests | |
parent | b805c84bbc72d07bbaff487c35bd0ea7420cdda2 (diff) | |
download | elementary-e74ec8caf2c909f6dd24e1a31ac01242156b0f3f.tar.gz |
Automatic migration to Eo4.
I just ran my script (email to follow) to migrate all of the EFL
automatically. This commit is *only* the automatic conversion, so it can
be easily reverted and re-run.
Diffstat (limited to 'src/tests')
62 files changed, 192 insertions, 195 deletions
diff --git a/src/tests/elm_test_actionslider.c b/src/tests/elm_test_actionslider.c index 83c7bfcb4..a6d7137fb 100644 --- a/src/tests/elm_test_actionslider.c +++ b/src/tests/elm_test_actionslider.c @@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC); actionslider = elm_actionslider_add(win); - eo_do(actionslider, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(actionslider); ck_assert(role == ELM_ATSPI_ROLE_SLIDER); diff --git a/src/tests/elm_test_atspi.c b/src/tests/elm_test_atspi.c index 7faae94db..82c1564e3 100644 --- a/src/tests/elm_test_atspi.c +++ b/src/tests/elm_test_atspi.c @@ -37,7 +37,7 @@ START_TEST (elm_atspi_app_obj_name_get) elm_app_name_set("Test name"); - eo_do(root, ret = elm_interface_atspi_accessible_name_get()); + ret = elm_interface_atspi_accessible_name_get(root); ck_assert_str_eq(ret, "Test name"); @@ -53,7 +53,7 @@ START_TEST (elm_atspi_name_get) char *name; - eo_do(g_btn, name = elm_interface_atspi_accessible_name_get()); + name = elm_interface_atspi_accessible_name_get(g_btn); if (name && name[0]) { ck_assert(0); @@ -64,7 +64,7 @@ START_TEST (elm_atspi_name_get) // Set name with additional text tags elm_object_text_set(g_btn, "Some<br>text"); - eo_do(g_btn, name = elm_interface_atspi_accessible_name_get()); + name = elm_interface_atspi_accessible_name_get(g_btn); // Accessible name should have cleared tags ck_assert(name != NULL); @@ -83,17 +83,17 @@ START_TEST (elm_atspi_name_set) char *name; elm_object_text_set(g_btn, "Other text"); - eo_do(g_btn, elm_interface_atspi_accessible_name_set("Test name")); + elm_interface_atspi_accessible_name_set(g_btn, "Test name"); - eo_do(g_btn, name = elm_interface_atspi_accessible_name_get()); + name = elm_interface_atspi_accessible_name_get(g_btn); ck_assert(name != NULL); ck_assert_str_eq(name, "Test name"); free(name); - eo_do(g_btn, elm_interface_atspi_accessible_name_set(NULL)); - eo_do(g_btn, name = elm_interface_atspi_accessible_name_get()); + elm_interface_atspi_accessible_name_set(g_btn, NULL); + name = elm_interface_atspi_accessible_name_get(g_btn); ck_assert(name != NULL); ck_assert_str_eq(name, "Other text"); @@ -112,7 +112,7 @@ START_TEST (elm_atspi_role_get) Elm_Atspi_Role role; - eo_do(root, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(root); ck_assert(role == ELM_ATSPI_ROLE_APPLICATION); @@ -127,14 +127,14 @@ START_TEST (elm_atspi_role_set) generate_app(); Elm_Atspi_Role role; - eo_do(g_btn, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ACCELERATOR_LABEL)); - eo_do(g_btn, role = elm_interface_atspi_accessible_role_get()); + elm_interface_atspi_accessible_role_set(g_btn, ELM_ATSPI_ROLE_ACCELERATOR_LABEL); + role = elm_interface_atspi_accessible_role_get(g_btn); if (role != ELM_ATSPI_ROLE_ACCELERATOR_LABEL) ck_assert(0); - eo_do(g_btn, elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_ENTRY)); - eo_do(g_btn, role = elm_interface_atspi_accessible_role_get()); + elm_interface_atspi_accessible_role_set(g_btn, ELM_ATSPI_ROLE_ENTRY); + role = elm_interface_atspi_accessible_role_get(g_btn); if (role != ELM_ATSPI_ROLE_ENTRY) ck_assert(0); @@ -153,7 +153,7 @@ START_TEST (elm_atspi_role_name_get) const char *ret = NULL; - eo_do(root, ret = elm_interface_atspi_accessible_role_name_get()); + ret = elm_interface_atspi_accessible_role_name_get(root); ck_assert(ret != NULL); @@ -170,7 +170,7 @@ START_TEST (elm_atspi_localized_role_name_get) const char *ret = NULL; - eo_do(root, ret = elm_interface_atspi_accessible_localized_role_name_get()); + ret = elm_interface_atspi_accessible_localized_role_name_get(root); ck_assert(ret != NULL); @@ -189,18 +189,18 @@ START_TEST (elm_atspi_description_set) const char *desc = "Test description"; - eo_do(root, ret = elm_interface_atspi_accessible_description_get()); + ret = elm_interface_atspi_accessible_description_get(root); ck_assert(ret == NULL); - eo_do(root, elm_interface_atspi_accessible_description_set(desc)); - eo_do(root, ret = elm_interface_atspi_accessible_description_get()); + elm_interface_atspi_accessible_description_set(root, desc); + ret = elm_interface_atspi_accessible_description_get(root); ck_assert(ret != NULL); ck_assert_str_eq(ret, "Test description"); - eo_do(root, elm_interface_atspi_accessible_description_set(NULL)); - eo_do(root, ret = elm_interface_atspi_accessible_description_get()); + elm_interface_atspi_accessible_description_set(root, NULL); + ret = elm_interface_atspi_accessible_description_get(root); ck_assert(ret == NULL); @@ -216,7 +216,7 @@ START_TEST (elm_atspi_description_get) generate_app(); const char *descr; - eo_do(g_bg, descr = elm_interface_atspi_accessible_description_get()); + descr = elm_interface_atspi_accessible_description_get(g_bg); ck_assert(descr == NULL); @@ -233,9 +233,9 @@ START_TEST (elm_atspi_children_and_parent) Eina_List *child_list = NULL; - eo_do(root, child_list = elm_interface_atspi_accessible_children_get()); + child_list = elm_interface_atspi_accessible_children_get(root); - //eo_do(eina_list_nth(child_list, 0), bg_child_list = elm_interface_atspi_accessible_children_get()); + //bg_child_list = elm_interface_atspi_accessible_children_get(eina_list_nth(child_list, 0)); ck_assert(eina_list_count(child_list) == 1); @@ -261,11 +261,11 @@ START_TEST (elm_atspi_children_and_parent2) Eo *win = NULL; Eina_List *root_children; - eo_do(root, root_children = elm_interface_atspi_accessible_children_get()); + root_children = elm_interface_atspi_accessible_children_get(root); win = eina_list_nth(root_children, 0); Eina_List *win_children; - eo_do(win, win_children = elm_interface_atspi_accessible_children_get()); + win_children = elm_interface_atspi_accessible_children_get(win); ck_assert(eina_list_count(win_children) == 1); @@ -288,7 +288,7 @@ START_TEST (elm_atspi_translation_domain_get) const char *domain; - eo_do(g_btn, domain = elm_interface_atspi_accessible_translation_domain_get()); + domain = elm_interface_atspi_accessible_translation_domain_get(g_btn); ck_assert(domain == NULL); @@ -303,14 +303,14 @@ START_TEST (elm_atspi_translation_domain_set) const char *domain; - eo_do(g_btn, elm_interface_atspi_accessible_translation_domain_set("Test translation_domain")); - eo_do(g_btn, domain = elm_interface_atspi_accessible_translation_domain_get()); + elm_interface_atspi_accessible_translation_domain_set(g_btn, "Test translation_domain"); + domain = elm_interface_atspi_accessible_translation_domain_get(g_btn); ck_assert(domain != NULL); ck_assert_str_eq(domain, "Test translation_domain"); - eo_do(g_btn, elm_interface_atspi_accessible_translation_domain_set(NULL)); - eo_do(g_btn, domain = elm_interface_atspi_accessible_translation_domain_get()); + elm_interface_atspi_accessible_translation_domain_set(g_btn, NULL); + domain = elm_interface_atspi_accessible_translation_domain_get(g_btn); ck_assert(domain == NULL); @@ -327,9 +327,9 @@ START_TEST (elm_atspi_relationship_append) Elm_Atspi_Relation *rel, *rel_to, *rel_from; Eina_List *l; - eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_bg)); - eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_FROM, g_win)); - eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get()); + elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); + elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win); + set = elm_interface_atspi_accessible_relation_set_get(g_btn); ck_assert(set != NULL); ck_assert(eina_list_count(set) >= 2); @@ -352,9 +352,9 @@ START_TEST (elm_atspi_relationship_append) elm_atspi_relation_set_free(set); /* Check if append do not procude duplicated relations */ - eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_bg)); - eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_FROM, g_win)); - eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get()); + elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); + elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win); + set = elm_interface_atspi_accessible_relation_set_get(g_btn); rel_to = rel_from = NULL; EINA_LIST_FOREACH(set, l, rel) @@ -391,10 +391,10 @@ START_TEST (elm_atspi_relationship_remove) Eina_List *l; /* Test if removal of single relationship works */ - eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_bg)); - eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_FROM, g_win)); - eo_do(g_btn, elm_interface_atspi_accessible_relationship_remove(ELM_ATSPI_RELATION_FLOWS_TO, g_bg)); - eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get()); + elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); + elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win); + elm_interface_atspi_accessible_relationship_remove(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); + set = elm_interface_atspi_accessible_relation_set_get(g_btn); ck_assert(set != NULL); ck_assert(eina_list_count(set) >= 1); @@ -415,10 +415,10 @@ START_TEST (elm_atspi_relationship_remove) elm_atspi_relation_set_free(set); /* Test if removal of type relationship works */ - eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_bg)); - eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_win)); - eo_do(g_btn, elm_interface_atspi_accessible_relationship_remove(ELM_ATSPI_RELATION_FLOWS_TO, NULL)); - eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get()); + elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); + elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_win); + elm_interface_atspi_accessible_relationship_remove(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, NULL); + set = elm_interface_atspi_accessible_relation_set_get(g_btn); rel_to = rel_from = NULL; EINA_LIST_FOREACH(set, l, rel) @@ -436,10 +436,10 @@ START_TEST (elm_atspi_relationship_remove) elm_atspi_relation_set_free(set); /* Test if relationship is implicity removed when object is deleted */ - eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_bg)); - eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_FROM, g_bg)); + elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); + elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_bg); eo_del(g_bg); - eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get()); + set = elm_interface_atspi_accessible_relation_set_get(g_btn); rel_to = rel_from = NULL; EINA_LIST_FOREACH(set, l, rel) @@ -467,14 +467,14 @@ START_TEST (elm_atspi_relationships_clear) elm_init(0, NULL); generate_app(); - eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_bg)); - eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_FROM, g_bg)); - eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_TO, g_win)); - eo_do(g_btn, elm_interface_atspi_accessible_relationship_append(ELM_ATSPI_RELATION_FLOWS_FROM, g_win)); + elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); + elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_bg); + elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_win); + elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win); - eo_do(g_btn, elm_interface_atspi_accessible_relationships_clear()); + elm_interface_atspi_accessible_relationships_clear(g_btn); - eo_do(g_btn, set = elm_interface_atspi_accessible_relation_set_get()); + set = elm_interface_atspi_accessible_relation_set_get(g_btn); EINA_LIST_FOREACH(set, l, rel) { ck_assert(!((rel->type == ELM_ATSPI_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_bg))); diff --git a/src/tests/elm_test_box.c b/src/tests/elm_test_box.c index 3f2808ca3..eb14a53aa 100644 --- a/src/tests/elm_test_box.c +++ b/src/tests/elm_test_box.c @@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "box", ELM_WIN_BASIC); box = elm_box_add(win); - eo_do(box, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(box); ck_assert(role == ELM_ATSPI_ROLE_FILLER); diff --git a/src/tests/elm_test_bubble.c b/src/tests/elm_test_bubble.c index f7bf36015..bbae3ce1d 100644 --- a/src/tests/elm_test_bubble.c +++ b/src/tests/elm_test_bubble.c @@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC); bubble = elm_bubble_add(win); - eo_do(bubble, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(bubble); ck_assert(role == ELM_ATSPI_ROLE_FILLER); diff --git a/src/tests/elm_test_button.c b/src/tests/elm_test_button.c index cef40908e..afa1cadd4 100644 --- a/src/tests/elm_test_button.c +++ b/src/tests/elm_test_button.c @@ -17,7 +17,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "button", ELM_WIN_BASIC); button = elm_button_add(win); - eo_do(button, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(button); ck_assert(role == ELM_ATSPI_ROLE_PUSH_BUTTON); diff --git a/src/tests/elm_test_calendar.c b/src/tests/elm_test_calendar.c index 714b3708a..433b5d14b 100644 --- a/src/tests/elm_test_calendar.c +++ b/src/tests/elm_test_calendar.c @@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC); calendar = elm_calendar_add(win); - eo_do(calendar, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(calendar); ck_assert(role == ELM_ATSPI_ROLE_CALENDAR); diff --git a/src/tests/elm_test_check.c b/src/tests/elm_test_check.c index 8ff9caba2..8abfe3a05 100644 --- a/src/tests/elm_test_check.c +++ b/src/tests/elm_test_check.c @@ -59,7 +59,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "check", ELM_WIN_BASIC); check = elm_check_add(win); - eo_do(check, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(check); ck_assert(role == ELM_ATSPI_ROLE_CHECK_BOX); diff --git a/src/tests/elm_test_clock.c b/src/tests/elm_test_clock.c index fdccab92e..713858d71 100644 --- a/src/tests/elm_test_clock.c +++ b/src/tests/elm_test_clock.c @@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "clock", ELM_WIN_BASIC); clk = elm_clock_add(win); - eo_do(clk, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(clk); ck_assert(role == ELM_ATSPI_ROLE_TEXT); diff --git a/src/tests/elm_test_colorselector.c b/src/tests/elm_test_colorselector.c index 78c3abd03..321f3df03 100644 --- a/src/tests/elm_test_colorselector.c +++ b/src/tests/elm_test_colorselector.c @@ -42,7 +42,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC); c = elm_colorselector_add(win); - eo_do(c, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(c); ck_assert(role == ELM_ATSPI_ROLE_COLOR_CHOOSER); diff --git a/src/tests/elm_test_conformant.c b/src/tests/elm_test_conformant.c index 1c96c138b..a646e5ecb 100644 --- a/src/tests/elm_test_conformant.c +++ b/src/tests/elm_test_conformant.c @@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC); conformant = elm_conformant_add(win); - eo_do(conformant, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(conformant); ck_assert(role == ELM_ATSPI_ROLE_FILLER); diff --git a/src/tests/elm_test_ctxpopup.c b/src/tests/elm_test_ctxpopup.c index 905530edd..5c5ed6f9c 100644 --- a/src/tests/elm_test_ctxpopup.c +++ b/src/tests/elm_test_ctxpopup.c @@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); ctxpopup = elm_ctxpopup_add(win); - eo_do(ctxpopup, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(ctxpopup); ck_assert(role == ELM_ATSPI_ROLE_POPUP_MENU); diff --git a/src/tests/elm_test_datetime.c b/src/tests/elm_test_datetime.c index ce3ad1d9d..0935f8866 100644 --- a/src/tests/elm_test_datetime.c +++ b/src/tests/elm_test_datetime.c @@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "datetime", ELM_WIN_BASIC); datetime = elm_datetime_add(win); - eo_do(datetime, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(datetime); ck_assert(role == ELM_ATSPI_ROLE_DATE_EDITOR); diff --git a/src/tests/elm_test_dayselector.c b/src/tests/elm_test_dayselector.c index c3e0fda47..d4f028878 100644 --- a/src/tests/elm_test_dayselector.c +++ b/src/tests/elm_test_dayselector.c @@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC); dayselector = elm_dayselector_add(win); - eo_do(dayselector, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(dayselector); ck_assert(role == ELM_ATSPI_ROLE_PANEL); diff --git a/src/tests/elm_test_diskselector.c b/src/tests/elm_test_diskselector.c index 34fba2312..e902939d5 100644 --- a/src/tests/elm_test_diskselector.c +++ b/src/tests/elm_test_diskselector.c @@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC); diskselector = elm_diskselector_add(win); - eo_do(diskselector, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(diskselector); ck_assert(role == ELM_ATSPI_ROLE_LIST); diff --git a/src/tests/elm_test_entry.c b/src/tests/elm_test_entry.c index f8c614b1a..ea898572e 100644 --- a/src/tests/elm_test_entry.c +++ b/src/tests/elm_test_entry.c @@ -38,22 +38,22 @@ START_TEST (elm_entry_atspi_text_char_get) expected = eina_unicode_utf8_to_unicode(txt, NULL); - eo_do(entry, val = elm_interface_atspi_text_character_get(-1)); + val = elm_interface_atspi_text_character_get(entry, -1); ck_assert(val == 0); - eo_do(entry, val = elm_interface_atspi_text_character_get(0)); + val = elm_interface_atspi_text_character_get(entry, 0); ck_assert(val == expected[0]); - eo_do(entry, val = elm_interface_atspi_text_character_get(1)); + val = elm_interface_atspi_text_character_get(entry, 1); ck_assert(val == expected[1]); - eo_do(entry, val = elm_interface_atspi_text_character_get(2)); + val = elm_interface_atspi_text_character_get(entry, 2); ck_assert(val == expected[2]); - eo_do(entry, val = elm_interface_atspi_text_character_get(6)); + val = elm_interface_atspi_text_character_get(entry, 6); ck_assert(val == expected[6]); - eo_do(entry, val = elm_interface_atspi_text_character_get(26)); + val = elm_interface_atspi_text_character_get(entry, 26); ck_assert(val == 0); free(expected); @@ -74,7 +74,7 @@ START_TEST (elm_entry_atspi_text_char_count) entry = elm_entry_add(win); elm_object_text_set(entry, mtxt); - eo_do(entry, val = elm_interface_atspi_text_character_count_get()); + val = elm_interface_atspi_text_character_count_get(entry); ck_assert(val == 12); elm_shutdown(); @@ -96,28 +96,28 @@ START_TEST (elm_entry_atspi_text_string_get_char) elm_object_text_set(entry, txt); start = 1; - eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end)); + val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end); ck_assert_str_eq(val, "o"); ck_assert(start == 1); ck_assert(end == 2); if (val) free(val); start = 8; - eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end)); + val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end); ck_assert_str_eq(val, "ś"); ck_assert(start == 8); ck_assert(end == 9); if (val) free(val); start = 11; - eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end)); + val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end); ck_assert_str_eq(val, " "); ck_assert(start == 11); ck_assert(end == 12); if (val) free(val); start = 111; - eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end)); + val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_CHAR, &start, &end); ck_assert(start == -1); ck_assert(end == -1); ck_assert(val == NULL); @@ -141,28 +141,28 @@ START_TEST (elm_entry_atspi_text_string_get_word) elm_object_text_set(entry, txt); start = 1; - eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end)); + val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end); ck_assert_str_eq(val, "Lorem"); ck_assert(start == 0); ck_assert(end == 5); if (val) free(val); start = 6; - eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end)); + val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end); ck_assert_str_eq(val, "ipśum"); ck_assert(start == 6); ck_assert(end == 11); if (val) free(val); start = 19; - eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end)); + val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end); ck_assert_str_eq(val, "dolor"); ck_assert(start == 14); ck_assert(end == 19); if (val) free(val); start = 111; - eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end)); + val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end); ck_assert(start == -1); ck_assert(end == -1); ck_assert(val == NULL); @@ -187,28 +187,28 @@ START_TEST (elm_entry_atspi_text_string_get_paragraph) elm_object_text_set(entry, txt); start = 1; - eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH, &start, &end)); + val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH, &start, &end); ck_assert_str_eq(val, "Lorem ipśum"); ck_assert(start == 0); ck_assert(end == 11); if (val) free(val); start = 20; - eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH, &start, &end)); + val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH, &start, &end); ck_assert_str_eq(val, " dolor sit"); ck_assert(start == 12); ck_assert(end == 24); if (val) free(val); start = 25; - eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH, &start, &end)); + val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_PARAGRAPH, &start, &end); ck_assert_str_eq(val, " amęt"); ck_assert(start == 25); ck_assert(end == 30); if (val) free(val); start = 111; - eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end)); + val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_WORD, &start, &end); ck_assert(start == -1); ck_assert(end == -1); ck_assert(val == NULL); @@ -235,7 +235,7 @@ START_TEST (elm_entry_atspi_text_string_get_line) elm_object_text_set(entry, txt); start = 1; - eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_LINE, &start, &end)); + val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_LINE, &start, &end); ck_assert_str_eq(val, "Lorem ipśum"); ck_assert(start == 0); @@ -243,7 +243,7 @@ START_TEST (elm_entry_atspi_text_string_get_line) if (val) free(val); start = 13; - eo_do(entry, val = elm_interface_atspi_text_string_get(ELM_ATSPI_TEXT_GRANULARITY_LINE, &start, &end)); + val = elm_interface_atspi_text_string_get(entry, ELM_ATSPI_TEXT_GRANULARITY_LINE, &start, &end); ck_assert_str_eq(val, " dolor sit amęt"); ck_assert(start == 12); ck_assert(end == 29); @@ -266,17 +266,17 @@ START_TEST (elm_entry_atspi_text_text_get) elm_object_text_set(entry, txt); // invalid ranges - eo_do(entry, val = elm_interface_atspi_text_get(6, 100)); + val = elm_interface_atspi_text_get(entry, 6, 100); ck_assert(val == NULL); - eo_do(entry, val = elm_interface_atspi_text_get(-6, 10)); + val = elm_interface_atspi_text_get(entry, -6, 10); ck_assert(val == NULL); - eo_do(entry, val = elm_interface_atspi_text_get(-6, -10)); + val = elm_interface_atspi_text_get(entry, -6, -10); ck_assert(val == NULL); - eo_do(entry, val = elm_interface_atspi_text_get(60, 100)); + val = elm_interface_atspi_text_get(entry, 60, 100); ck_assert(val == NULL); // proper range - eo_do(entry, val = elm_interface_atspi_text_get(6, 17)); + val = elm_interface_atspi_text_get(entry, 6, 17); ck_assert_str_eq(val, "Xpśum dolor"); if (val) free(val); @@ -298,30 +298,30 @@ START_TEST (elm_entry_atspi_text_selections) entry = elm_entry_add(win); elm_object_text_set(entry, txt); - eo_do(entry, val = elm_interface_atspi_text_selections_count_get()); + val = elm_interface_atspi_text_selections_count_get(entry); ck_assert(val == 0); elm_entry_select_region_set(entry, 2, 4); - eo_do(entry, val = elm_interface_atspi_text_selections_count_get()); + val = elm_interface_atspi_text_selections_count_get(entry); ck_assert(val == 1); - eo_do(entry, elm_interface_atspi_text_selection_get(0, &start, &end)); + elm_interface_atspi_text_selection_get(entry, 0, &start, &end); ck_assert(start == 2); ck_assert(end == 4); elm_entry_select_region_set(entry, 6, 10); - eo_do(entry, val = elm_interface_atspi_text_selections_count_get()); + val = elm_interface_atspi_text_selections_count_get(entry); ck_assert(val == 1); - eo_do(entry, elm_interface_atspi_text_selection_get(0, &start, &end)); + elm_interface_atspi_text_selection_get(entry, 0, &start, &end); ck_assert(start == 6); ck_assert(end == 10); elm_entry_select_none(entry); - eo_do(entry, ret = elm_interface_atspi_text_selection_add(2, 5)); + ret = elm_interface_atspi_text_selection_add(entry, 2, 5); ck_assert(ret == EINA_TRUE); str = elm_entry_selection_get(entry); ck_assert_str_eq(str, "rem"); - eo_do(entry, ret = elm_interface_atspi_text_selection_remove(0)); + ret = elm_interface_atspi_text_selection_remove(entry, 0); ck_assert(ret == EINA_TRUE); str = elm_entry_selection_get(entry); ck_assert(str == NULL); @@ -339,7 +339,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); entry = elm_entry_add(win); - eo_do(entry, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(entry); ck_assert(role == ELM_ATSPI_ROLE_ENTRY); diff --git a/src/tests/elm_test_fileselector.c b/src/tests/elm_test_fileselector.c index cda9ed0f1..4a86d999a 100644 --- a/src/tests/elm_test_fileselector.c +++ b/src/tests/elm_test_fileselector.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC); fileselector = elm_fileselector_add(win); - eo_do(fileselector, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(fileselector); ck_assert(role == ELM_ATSPI_ROLE_FILE_CHOOSER); diff --git a/src/tests/elm_test_fileselector_button.c b/src/tests/elm_test_fileselector_button.c index fab98ef9b..653678d9d 100644 --- a/src/tests/elm_test_fileselector_button.c +++ b/src/tests/elm_test_fileselector_button.c @@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "fileselector_button", ELM_WIN_BASIC); fs_button = elm_fileselector_button_add(win); - eo_do(fs_button, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(fs_button); ck_assert(role == ELM_ATSPI_ROLE_PUSH_BUTTON); diff --git a/src/tests/elm_test_fileselector_entry.c b/src/tests/elm_test_fileselector_entry.c index 5dedd8987..d78cf1b23 100644 --- a/src/tests/elm_test_fileselector_entry.c +++ b/src/tests/elm_test_fileselector_entry.c @@ -15,7 +15,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "fileselectorentry", ELM_WIN_BASIC); fs_entry = elm_fileselector_entry_add(win); - eo_do(fs_entry, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(fs_entry); ck_assert(role == ELM_ATSPI_ROLE_GROUPING); diff --git a/src/tests/elm_test_flip.c b/src/tests/elm_test_flip.c index bd7d16f31..947c020dd 100644 --- a/src/tests/elm_test_flip.c +++ b/src/tests/elm_test_flip.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "flip", ELM_WIN_BASIC); flip = elm_flip_add(win); - eo_do(flip, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(flip); ck_assert(role == ELM_ATSPI_ROLE_PAGE_TAB_LIST); diff --git a/src/tests/elm_test_flipselector.c b/src/tests/elm_test_flipselector.c index c14039f81..2ede134a0 100644 --- a/src/tests/elm_test_flipselector.c +++ b/src/tests/elm_test_flipselector.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC); flipselector = elm_flipselector_add(win); - eo_do(flipselector, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(flipselector); ck_assert(role == ELM_ATSPI_ROLE_LIST); diff --git a/src/tests/elm_test_frame.c b/src/tests/elm_test_frame.c index 2744e97aa..2527544a3 100644 --- a/src/tests/elm_test_frame.c +++ b/src/tests/elm_test_frame.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "frame", ELM_WIN_BASIC); frame = elm_frame_add(win); - eo_do(frame, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(frame); ck_assert(role == ELM_ATSPI_ROLE_FRAME); diff --git a/src/tests/elm_test_gengrid.c b/src/tests/elm_test_gengrid.c index f0b3c2a29..54e37e20c 100644 --- a/src/tests/elm_test_gengrid.c +++ b/src/tests/elm_test_gengrid.c @@ -17,7 +17,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC); gengrid = elm_gengrid_add(win); - eo_do(gengrid, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(gengrid); ck_assert(role == ELM_ATSPI_ROLE_TREE_TABLE); @@ -66,7 +66,7 @@ START_TEST(elm_atspi_children_parent) elm_gengrid_item_fields_update(it, "*.", ELM_GENGRID_ITEM_FIELD_CONTENT); ck_assert(content != NULL); - eo_do(content, parent = elm_interface_atspi_accessible_parent_get()); + parent = elm_interface_atspi_accessible_parent_get(content); ck_assert(it == parent); elm_shutdown(); diff --git a/src/tests/elm_test_genlist.c b/src/tests/elm_test_genlist.c index a2008156f..5d23930f2 100644 --- a/src/tests/elm_test_genlist.c +++ b/src/tests/elm_test_genlist.c @@ -28,7 +28,7 @@ START_TEST (elm_atspi_role_get) Elm_Atspi_Role role; - eo_do(genlist, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(genlist); ck_assert(role == ELM_ATSPI_ROLE_LIST); @@ -42,14 +42,14 @@ START_TEST(elm_atspi_children_get1) Eina_List *children; Elm_Object_Item *it[3]; - eo_do(genlist, children = elm_interface_atspi_accessible_children_get()); + children = elm_interface_atspi_accessible_children_get(genlist); ck_assert(children == NULL); it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); it[1] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); - eo_do(genlist, children = elm_interface_atspi_accessible_children_get()); + children = elm_interface_atspi_accessible_children_get(genlist); ck_assert(eina_list_count(children) == 3); ck_assert(eina_list_nth(children, 0) == it[0]); ck_assert(eina_list_nth(children, 1) == it[1]); @@ -71,7 +71,7 @@ START_TEST(elm_atspi_children_get2) it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_GROUP, NULL, NULL); it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL); - eo_do(genlist, children = elm_interface_atspi_accessible_children_get()); + children = elm_interface_atspi_accessible_children_get(genlist); ck_assert(eina_list_nth(children, 1) == it[0]); ck_assert(eina_list_nth(children, 0) == it[1]); ck_assert(eina_list_nth(children, 2) == it[2]); @@ -103,7 +103,7 @@ START_TEST(elm_atspi_children_events_add) Elm_Object_Item *it[3]; - eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_handler_add(_children_changed_cb, NULL)); + elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _children_changed_cb, NULL); it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); ck_assert(genlist == current); @@ -140,7 +140,7 @@ START_TEST(elm_atspi_children_events_del1) it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL); - eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_handler_add(_children_changed_cb, NULL)); + elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _children_changed_cb, NULL); elm_object_item_del(it[0]); ck_assert(genlist == current); @@ -168,7 +168,7 @@ START_TEST(elm_atspi_children_events_del2) it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); - eo_do(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, elm_interface_atspi_accessible_event_handler_add(_children_changed_cb, NULL)); + elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _children_changed_cb, NULL); elm_genlist_clear(genlist); ck_assert(genlist == current); diff --git a/src/tests/elm_test_glview.c b/src/tests/elm_test_glview.c index 1ad462c5d..556c22f6e 100644 --- a/src/tests/elm_test_glview.c +++ b/src/tests/elm_test_glview.c @@ -20,7 +20,7 @@ START_TEST (elm_atspi_role_get) // if no gl backend skip test if (glview) { - eo_do(glview, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(glview); ck_assert(role == ELM_ATSPI_ROLE_ANIMATION); } diff --git a/src/tests/elm_test_grid.c b/src/tests/elm_test_grid.c index 9f0526154..f1350d49e 100644 --- a/src/tests/elm_test_grid.c +++ b/src/tests/elm_test_grid.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "grid", ELM_WIN_BASIC); grid = elm_grid_add(win); - eo_do(grid, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(grid); ck_assert(role == ELM_ATSPI_ROLE_FILLER); diff --git a/src/tests/elm_test_hover.c b/src/tests/elm_test_hover.c index 5eedb19ed..b23f89211 100644 --- a/src/tests/elm_test_hover.c +++ b/src/tests/elm_test_hover.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "hover", ELM_WIN_BASIC); hover = elm_hover_add(win); - eo_do(hover, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(hover); ck_assert(role == ELM_ATSPI_ROLE_POPUP_MENU); diff --git a/src/tests/elm_test_hoversel.c b/src/tests/elm_test_hoversel.c index dedccf652..14f1148b5 100644 --- a/src/tests/elm_test_hoversel.c +++ b/src/tests/elm_test_hoversel.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC); hoversel = elm_hoversel_add(win); - eo_do(hoversel, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(hoversel); ck_assert(role == ELM_ATSPI_ROLE_PUSH_BUTTON); diff --git a/src/tests/elm_test_icon.c b/src/tests/elm_test_icon.c index 757e00d26..7cc9469d8 100644 --- a/src/tests/elm_test_icon.c +++ b/src/tests/elm_test_icon.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); icon = elm_icon_add(win); - eo_do(icon, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(icon); ck_assert(role == ELM_ATSPI_ROLE_IMAGE); diff --git a/src/tests/elm_test_image.c b/src/tests/elm_test_image.c index 2d075f79e..fcc728c8f 100644 --- a/src/tests/elm_test_image.c +++ b/src/tests/elm_test_image.c @@ -26,7 +26,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "image", ELM_WIN_BASIC); image = elm_image_add(win); - eo_do(image, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(image); ck_assert(role == ELM_ATSPI_ROLE_IMAGE); @@ -42,7 +42,7 @@ _async_error_cb(void *data, Eo *obj, Test_Data *td = data; char path[PATH_MAX]; sprintf(path, pathfmt, td->image_id); - eo_do(obj, efl_file_set(path, NULL)); + efl_file_set(obj, path, NULL); return EO_CALLBACK_CONTINUE; } @@ -56,7 +56,7 @@ _async_opened_cb(void *data, Eo *obj, char path[PATH_MAX]; sprintf(path, pathfmt, td->image_id); - eo_do(obj, efl_file_get(&ff, &kk)); + efl_file_get(obj, &ff, &kk); r1 = strrchr(ff, '/'); r2 = strrchr(path, '/'); ck_assert(!strcmp(r1, r2)); @@ -66,7 +66,7 @@ _async_opened_cb(void *data, Eo *obj, { td->image_id++; sprintf(path, pathfmt, td->image_id); - eo_do(obj, efl_file_set(path, NULL)); + efl_file_set(obj, path, NULL); return EO_CALLBACK_CONTINUE; } else if (td->image_id < MAX_IMAGE_ID) @@ -75,7 +75,7 @@ _async_opened_cb(void *data, Eo *obj, for (; td->image_id < MAX_IMAGE_ID;) { sprintf(path, pathfmt, ++td->image_id); - eo_do(obj, efl_file_set(path, NULL)); + efl_file_set(obj, path, NULL); } return EO_CALLBACK_CONTINUE; } @@ -110,13 +110,12 @@ START_TEST (elm_image_async_path) td.image_id = 0; image = elm_image_add(win); - eo_do(image, - one = efl_file_async_get(); - efl_file_async_set(1); - eo_event_callback_add(EFL_FILE_EVENT_ASYNC_ERROR, _async_error_cb, &td); - eo_event_callback_add(EFL_FILE_EVENT_ASYNC_OPENED, _async_opened_cb, &td); - ok = efl_file_set(invalid, NULL); - two = efl_file_async_get()); + one = efl_file_async_get(image); + efl_file_async_set(image, 1); + eo_event_callback_add(image, EFL_FILE_EVENT_ASYNC_ERROR, _async_error_cb, &td); + eo_event_callback_add(image, EFL_FILE_EVENT_ASYNC_OPENED, _async_opened_cb, &td); + ok = efl_file_set(image, invalid, NULL); + two = efl_file_async_get(image); ck_assert(!one && two); ck_assert(ok); @@ -148,12 +147,10 @@ START_TEST (elm_image_async_mmap) ck_assert(f); image = elm_image_add(win); - eo_do(image, - efl_file_async_set(1); - eo_event_callback_add(EFL_FILE_EVENT_ASYNC_ERROR, _async_error_cb, &td); - eo_event_callback_add(EFL_FILE_EVENT_ASYNC_OPENED, _async_opened_cb, &td); - ok = efl_file_mmap_set(f, NULL); - ); + efl_file_async_set(image, 1); + eo_event_callback_add(image, EFL_FILE_EVENT_ASYNC_ERROR, _async_error_cb, &td); + eo_event_callback_add(image, EFL_FILE_EVENT_ASYNC_OPENED, _async_opened_cb, &td); + ok = efl_file_mmap_set(image, f, NULL); ck_assert(ok); ecore_timer_add(10.0, _timeout_cb, &td); diff --git a/src/tests/elm_test_index.c b/src/tests/elm_test_index.c index 6b9fdc132..1a34933cc 100644 --- a/src/tests/elm_test_index.c +++ b/src/tests/elm_test_index.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "index", ELM_WIN_BASIC); idx = elm_index_add(win); - eo_do(idx, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(idx); ck_assert(role == ELM_ATSPI_ROLE_SCROLL_BAR); diff --git a/src/tests/elm_test_inwin.c b/src/tests/elm_test_inwin.c index a5bcfc7d2..942945dff 100644 --- a/src/tests/elm_test_inwin.c +++ b/src/tests/elm_test_inwin.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC); inwin = elm_win_inwin_add(win); - eo_do(inwin, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(inwin); ck_assert(role == ELM_ATSPI_ROLE_GLASS_PANE); diff --git a/src/tests/elm_test_label.c b/src/tests/elm_test_label.c index 813ef2f7d..a81fdf441 100644 --- a/src/tests/elm_test_label.c +++ b/src/tests/elm_test_label.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "label", ELM_WIN_BASIC); label = elm_label_add(win); - eo_do(label, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(label); ck_assert(role == ELM_ATSPI_ROLE_LABEL); diff --git a/src/tests/elm_test_layout.c b/src/tests/elm_test_layout.c index f1d45719e..5ccfb50f8 100644 --- a/src/tests/elm_test_layout.c +++ b/src/tests/elm_test_layout.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); layout = elm_layout_add(win); - eo_do(layout, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(layout); ck_assert(role == ELM_ATSPI_ROLE_FILLER); diff --git a/src/tests/elm_test_list.c b/src/tests/elm_test_list.c index 54665f41f..3afd06249 100644 --- a/src/tests/elm_test_list.c +++ b/src/tests/elm_test_list.c @@ -23,15 +23,15 @@ START_TEST (elm_list_atspi_selection_selected_children_count_get) list = elm_list_add(win); item = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL); - eo_do(list, val = elm_interface_atspi_selection_selected_children_count_get()); + val = elm_interface_atspi_selection_selected_children_count_get(list); ck_assert(val == 0); elm_list_item_selected_set(item, EINA_TRUE); - eo_do(list, val = elm_interface_atspi_selection_selected_children_count_get()); + val = elm_interface_atspi_selection_selected_children_count_get(list); ck_assert(val == 1); elm_list_item_selected_set(item, EINA_FALSE); - eo_do(list, val = elm_interface_atspi_selection_selected_children_count_get()); + val = elm_interface_atspi_selection_selected_children_count_get(list); ck_assert(val == 0); elm_shutdown(); @@ -50,7 +50,7 @@ START_TEST (elm_list_atspi_selection_child_select) list = elm_list_add(win); item = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL); - eo_do(list, val = elm_interface_atspi_selection_child_select(0)); + val = elm_interface_atspi_selection_child_select(list, 0); ck_assert(val == EINA_TRUE); ck_assert(EINA_TRUE == elm_list_item_selected_get(item)); @@ -73,7 +73,7 @@ START_TEST (elm_list_atspi_selection_selected_child_deselect) item = elm_list_item_append(list, "Second Element", NULL, NULL, NULL, NULL); elm_list_item_selected_set(item, EINA_TRUE); - eo_do(list, val = elm_interface_atspi_selection_selected_child_deselect(0)); + val = elm_interface_atspi_selection_selected_child_deselect(list, 0); ck_assert(val == EINA_TRUE); ck_assert(EINA_FALSE == elm_list_item_selected_get(item)); @@ -93,11 +93,11 @@ START_TEST (elm_list_atspi_selection_is_child_selected) list = elm_list_add(win); item = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL); - eo_do(list, val = elm_interface_atspi_selection_is_child_selected(0)); + val = elm_interface_atspi_selection_is_child_selected(list, 0); ck_assert(val == EINA_FALSE); elm_list_item_selected_set(item, EINA_TRUE); - eo_do(list, val = elm_interface_atspi_selection_is_child_selected(0)); + val = elm_interface_atspi_selection_is_child_selected(list, 0); ck_assert(val == EINA_TRUE); elm_shutdown(); @@ -118,11 +118,11 @@ START_TEST (elm_list_atspi_selection_all_children_select) item1 = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL); item2 = elm_list_item_append(list, "Second Element", NULL, NULL, NULL, NULL); - eo_do(list, val = elm_interface_atspi_selection_all_children_select()); + val = elm_interface_atspi_selection_all_children_select(list); ck_assert(val == EINA_FALSE); elm_list_multi_select_set(list, EINA_TRUE); - eo_do(list, val = elm_interface_atspi_selection_all_children_select()); + val = elm_interface_atspi_selection_all_children_select(list); ck_assert(val == EINA_TRUE); ck_assert(EINA_TRUE == elm_list_item_selected_get(item1)); ck_assert(EINA_TRUE == elm_list_item_selected_get(item2)); @@ -149,7 +149,7 @@ START_TEST (elm_list_atspi_selection_clear) elm_list_item_selected_set(item2, EINA_TRUE); - eo_do(list, val = elm_interface_atspi_selection_clear()); + val = elm_interface_atspi_selection_clear(list); ck_assert(val == EINA_TRUE); ck_assert(EINA_FALSE == elm_list_item_selected_get(item1)); ck_assert(EINA_FALSE == elm_list_item_selected_get(item2)); @@ -173,7 +173,7 @@ START_TEST (elm_list_atspi_selection_child_deselect) item = elm_list_item_append(list, "Second Element", NULL, NULL, NULL, NULL); elm_list_item_selected_set(item, EINA_TRUE); - eo_do(list, val = elm_interface_atspi_selection_selected_child_deselect(1)); + val = elm_interface_atspi_selection_selected_child_deselect(list, 1); ck_assert(val == EINA_TRUE); ck_assert(EINA_FALSE == elm_list_item_selected_get(item)); @@ -192,7 +192,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "list", ELM_WIN_BASIC); list = elm_list_add(win); - eo_do(list, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(list); ck_assert(role == ELM_ATSPI_ROLE_LIST); @@ -220,10 +220,10 @@ START_TEST(elm_atspi_children_parent) evas_object_show(list); - eo_do(icon, parent = elm_interface_atspi_accessible_parent_get()); + parent = elm_interface_atspi_accessible_parent_get(icon); ck_assert(list == parent); - eo_do(end, parent = elm_interface_atspi_accessible_parent_get()); + parent = elm_interface_atspi_accessible_parent_get(end); ck_assert(list == parent); elm_shutdown(); diff --git a/src/tests/elm_test_map.c b/src/tests/elm_test_map.c index 81935d505..efaaa8f7f 100644 --- a/src/tests/elm_test_map.c +++ b/src/tests/elm_test_map.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "map", ELM_WIN_BASIC); map = elm_map_add(win); - eo_do(map, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(map); ck_assert(role == ELM_ATSPI_ROLE_IMAGE_MAP); diff --git a/src/tests/elm_test_mapbuf.c b/src/tests/elm_test_mapbuf.c index e9d571ac5..570d37f4c 100644 --- a/src/tests/elm_test_mapbuf.c +++ b/src/tests/elm_test_mapbuf.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC); mapbuf = elm_mapbuf_add(win); - eo_do(mapbuf, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(mapbuf); ck_assert(role == ELM_ATSPI_ROLE_IMAGE_MAP); diff --git a/src/tests/elm_test_menu.c b/src/tests/elm_test_menu.c index 1975db1ea..015bc8985 100644 --- a/src/tests/elm_test_menu.c +++ b/src/tests/elm_test_menu.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "menu", ELM_WIN_BASIC); menu = elm_menu_add(win); - eo_do(menu, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(menu); ck_assert(role == ELM_ATSPI_ROLE_MENU); diff --git a/src/tests/elm_test_multibuttonentry.c b/src/tests/elm_test_multibuttonentry.c index 3c29ee374..9a8a34a26 100644 --- a/src/tests/elm_test_multibuttonentry.c +++ b/src/tests/elm_test_multibuttonentry.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "multibuttonentry", ELM_WIN_BASIC); multibuttonentry = elm_multibuttonentry_add(win); - eo_do(multibuttonentry, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(multibuttonentry); ck_assert(role == ELM_ATSPI_ROLE_ENTRY); diff --git a/src/tests/elm_test_naviframe.c b/src/tests/elm_test_naviframe.c index 7e6844743..a34ce3e6e 100644 --- a/src/tests/elm_test_naviframe.c +++ b/src/tests/elm_test_naviframe.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC); naviframe = elm_naviframe_add(win); - eo_do(naviframe, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(naviframe); ck_assert(role == ELM_ATSPI_ROLE_PAGE_TAB_LIST); diff --git a/src/tests/elm_test_notify.c b/src/tests/elm_test_notify.c index a213fa2de..9fe99cf01 100644 --- a/src/tests/elm_test_notify.c +++ b/src/tests/elm_test_notify.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "notify", ELM_WIN_BASIC); notify = elm_notify_add(win); - eo_do(notify, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(notify); ck_assert(role == ELM_ATSPI_ROLE_NOTIFICATION); diff --git a/src/tests/elm_test_panel.c b/src/tests/elm_test_panel.c index 2e34739f4..e98792ee6 100644 --- a/src/tests/elm_test_panel.c +++ b/src/tests/elm_test_panel.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "panel", ELM_WIN_BASIC); panel = elm_panel_add(win); - eo_do(panel, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(panel); ck_assert(role == ELM_ATSPI_ROLE_PANEL); diff --git a/src/tests/elm_test_panes.c b/src/tests/elm_test_panes.c index fc286914f..fea0a02e2 100644 --- a/src/tests/elm_test_panes.c +++ b/src/tests/elm_test_panes.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "panes", ELM_WIN_BASIC); panes = elm_panes_add(win); - eo_do(panes, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(panes); ck_assert(role == ELM_ATSPI_ROLE_SPLIT_PANE); diff --git a/src/tests/elm_test_photo.c b/src/tests/elm_test_photo.c index 322c363cb..3d8bc5fc4 100644 --- a/src/tests/elm_test_photo.c +++ b/src/tests/elm_test_photo.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "photo", ELM_WIN_BASIC); photo = elm_photo_add(win); - eo_do(photo, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(photo); ck_assert(role == ELM_ATSPI_ROLE_IMAGE); diff --git a/src/tests/elm_test_photocam.c b/src/tests/elm_test_photocam.c index f60604f34..e8d1f78c5 100644 --- a/src/tests/elm_test_photocam.c +++ b/src/tests/elm_test_photocam.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC); photocam = elm_photocam_add(win); - eo_do(photocam, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(photocam); ck_assert(role == ELM_ATSPI_ROLE_IMAGE); diff --git a/src/tests/elm_test_player.c b/src/tests/elm_test_player.c index be62d89a6..863bfba00 100644 --- a/src/tests/elm_test_player.c +++ b/src/tests/elm_test_player.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "player", ELM_WIN_BASIC); player = elm_player_add(win); - eo_do(player, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(player); ck_assert(role == ELM_ATSPI_ROLE_ANIMATION); diff --git a/src/tests/elm_test_plug.c b/src/tests/elm_test_plug.c index c8ad28931..8139ae538 100644 --- a/src/tests/elm_test_plug.c +++ b/src/tests/elm_test_plug.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "plug", ELM_WIN_BASIC); plug = elm_plug_add(win); - eo_do(plug, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(plug); ck_assert(role == ELM_ATSPI_ROLE_IMAGE); diff --git a/src/tests/elm_test_popup.c b/src/tests/elm_test_popup.c index f98adf146..b28447544 100644 --- a/src/tests/elm_test_popup.c +++ b/src/tests/elm_test_popup.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "popup", ELM_WIN_BASIC); popup = elm_popup_add(win); - eo_do(popup, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(popup); ck_assert(role == ELM_ATSPI_ROLE_NOTIFICATION); diff --git a/src/tests/elm_test_prefs.c b/src/tests/elm_test_prefs.c index a4418450c..b27d5705e 100644 --- a/src/tests/elm_test_prefs.c +++ b/src/tests/elm_test_prefs.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "prefs", ELM_WIN_BASIC); prefs = elm_prefs_add(win); - eo_do(prefs, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(prefs); ck_assert(role == ELM_ATSPI_ROLE_REDUNDANT_OBJECT); diff --git a/src/tests/elm_test_progressbar.c b/src/tests/elm_test_progressbar.c index fe6900a67..53319d7ff 100644 --- a/src/tests/elm_test_progressbar.c +++ b/src/tests/elm_test_progressbar.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC); progressbar = elm_progressbar_add(win); - eo_do(progressbar, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(progressbar); ck_assert(role == ELM_ATSPI_ROLE_PROGRESS_BAR); diff --git a/src/tests/elm_test_radio.c b/src/tests/elm_test_radio.c index c0a92a2d1..874dbe7d4 100644 --- a/src/tests/elm_test_radio.c +++ b/src/tests/elm_test_radio.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "radio", ELM_WIN_BASIC); radio = elm_radio_add(win); - eo_do(radio, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(radio); ck_assert(role == ELM_ATSPI_ROLE_RADIO_BUTTON); diff --git a/src/tests/elm_test_scroller.c b/src/tests/elm_test_scroller.c index 9ccbc41a4..537710f4d 100644 --- a/src/tests/elm_test_scroller.c +++ b/src/tests/elm_test_scroller.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC); scroller = elm_scroller_add(win); - eo_do(scroller, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(scroller); ck_assert(role == ELM_ATSPI_ROLE_SCROLL_PANE); diff --git a/src/tests/elm_test_segmentcontrol.c b/src/tests/elm_test_segmentcontrol.c index 5c60feb3a..31812e6fe 100644 --- a/src/tests/elm_test_segmentcontrol.c +++ b/src/tests/elm_test_segmentcontrol.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "segmentcontrol", ELM_WIN_BASIC); segmentcontrol = elm_segment_control_add(win); - eo_do(segmentcontrol, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(segmentcontrol); ck_assert(role == ELM_ATSPI_ROLE_LIST); diff --git a/src/tests/elm_test_separator.c b/src/tests/elm_test_separator.c index 869b8eee8..a786cd367 100644 --- a/src/tests/elm_test_separator.c +++ b/src/tests/elm_test_separator.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); separator = elm_separator_add(win); - eo_do(separator, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(separator); ck_assert(role == ELM_ATSPI_ROLE_SEPARATOR); diff --git a/src/tests/elm_test_slider.c b/src/tests/elm_test_slider.c index 99874b9a4..59e359de5 100644 --- a/src/tests/elm_test_slider.c +++ b/src/tests/elm_test_slider.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "slider", ELM_WIN_BASIC); slider = elm_slider_add(win); - eo_do(slider, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(slider); ck_assert(role == ELM_ATSPI_ROLE_SLIDER); diff --git a/src/tests/elm_test_slideshow.c b/src/tests/elm_test_slideshow.c index fb2828f5c..8edacc5e9 100644 --- a/src/tests/elm_test_slideshow.c +++ b/src/tests/elm_test_slideshow.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC); slideshow = elm_slideshow_add(win); - eo_do(slideshow, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(slideshow); ck_assert(role == ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION); diff --git a/src/tests/elm_test_spinner.c b/src/tests/elm_test_spinner.c index 41049d2ed..bc77c9738 100644 --- a/src/tests/elm_test_spinner.c +++ b/src/tests/elm_test_spinner.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC); spinner = elm_spinner_add(win); - eo_do(spinner, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(spinner); ck_assert(role == ELM_ATSPI_ROLE_SPIN_BUTTON); diff --git a/src/tests/elm_test_table.c b/src/tests/elm_test_table.c index ad0d80590..bb7edc5b1 100644 --- a/src/tests/elm_test_table.c +++ b/src/tests/elm_test_table.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "table", ELM_WIN_BASIC); table = elm_table_add(win); - eo_do(table, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(table); ck_assert(role == ELM_ATSPI_ROLE_FILLER); diff --git a/src/tests/elm_test_thumb.c b/src/tests/elm_test_thumb.c index 68db163d0..3a06b0cd7 100644 --- a/src/tests/elm_test_thumb.c +++ b/src/tests/elm_test_thumb.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC); thumb = elm_thumb_add(win); - eo_do(thumb, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(thumb); ck_assert(role == ELM_ATSPI_ROLE_IMAGE); diff --git a/src/tests/elm_test_toolbar.c b/src/tests/elm_test_toolbar.c index 7e4a6b5c7..d50f50b45 100644 --- a/src/tests/elm_test_toolbar.c +++ b/src/tests/elm_test_toolbar.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC); toolbar = elm_toolbar_add(win); - eo_do(toolbar, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(toolbar); ck_assert(role == ELM_ATSPI_ROLE_TOOL_BAR); diff --git a/src/tests/elm_test_video.c b/src/tests/elm_test_video.c index 100feaa42..f3b7fea2d 100644 --- a/src/tests/elm_test_video.c +++ b/src/tests/elm_test_video.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "video", ELM_WIN_BASIC); video = elm_video_add(win); - eo_do(video, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(video); ck_assert(role == ELM_ATSPI_ROLE_ANIMATION); diff --git a/src/tests/elm_test_web.c b/src/tests/elm_test_web.c index d1b8ea765..5efa8f067 100644 --- a/src/tests/elm_test_web.c +++ b/src/tests/elm_test_web.c @@ -16,7 +16,7 @@ START_TEST (elm_atspi_role_get) win = elm_win_add(NULL, "web", ELM_WIN_BASIC); web = elm_web_add(win); - eo_do(web, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(web); ck_assert(role == ELM_ATSPI_ROLE_HTML_CONTAINER); diff --git a/src/tests/elm_test_win.c b/src/tests/elm_test_win.c index 6fc07ef81..b10d5610a 100644 --- a/src/tests/elm_test_win.c +++ b/src/tests/elm_test_win.c @@ -17,7 +17,7 @@ _do_delete_request(Eo *win) { #ifdef HAVE_ELEMENTARY_X Ecore_X_Window xwin; - eo_do(win, xwin = elm_obj_win_xwindow_get()); + xwin = elm_obj_win_xwindow_get(win); ecore_x_window_delete_request_send(xwin); #endif @@ -37,7 +37,7 @@ static Eina_Bool _timer_hide_window_cb(void *data) { Eo *win = (Eo*) data; - eo_do(win, efl_gfx_visible_set(EINA_FALSE)); + efl_gfx_visible_set(win, EINA_FALSE); return ECORE_CALLBACK_PASS_ON; } @@ -66,7 +66,7 @@ START_TEST (elm_atspi_role_get) elm_init(1, NULL); win = elm_win_add(NULL, "win", ELM_WIN_BASIC); - eo_do(win, role = elm_interface_atspi_accessible_role_get()); + role = elm_interface_atspi_accessible_role_get(win); ck_assert(role == ELM_ATSPI_ROLE_WINDOW); @@ -83,7 +83,7 @@ START_TEST (elm_atspi_component_position) Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC); - eo_do(win, ret = elm_interface_atspi_component_position_set(EINA_TRUE, 45, 45)); + ret = elm_interface_atspi_component_position_set(win, EINA_TRUE, 45, 45); ck_assert(ret == EINA_TRUE); Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(win)); @@ -106,7 +106,7 @@ START_TEST (elm_atspi_component_size) Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC); evas_object_resize(win, 50, 50); - eo_do(win, ret = elm_interface_atspi_component_size_set(100, 100)); + ret = elm_interface_atspi_component_size_set(win, 100, 100); ck_assert(ret == EINA_TRUE); evas_object_geometry_get(win, NULL, NULL, &w, &h); @@ -121,8 +121,8 @@ START_TEST (elm_win_autohide) elm_init(0, NULL); Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC); - eo_do(win, elm_obj_win_autohide_set(EINA_TRUE)); - eo_do(win, efl_gfx_visible_set(EINA_TRUE)); + elm_obj_win_autohide_set(win, EINA_TRUE); + efl_gfx_visible_set(win, EINA_TRUE); Eina_Bool fail_flag = EINA_FALSE; ecore_timer_add(_timeout1, _timer_delete_request_cb, win); @@ -131,7 +131,7 @@ START_TEST (elm_win_autohide) elm_run(); Eina_Bool visible; - eo_do(win, visible = efl_gfx_visible_get()); + visible = efl_gfx_visible_get(win); ck_assert(visible == EINA_FALSE); @@ -146,7 +146,7 @@ START_TEST (elm_win_policy_quit_last_window_hidden) elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN); Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC); - eo_do(win, efl_gfx_visible_set(EINA_TRUE)); + efl_gfx_visible_set(win, EINA_TRUE); Eina_Bool fail_flag = EINA_FALSE; ecore_timer_add(_timeout1, _timer_hide_window_cb, win); @@ -155,7 +155,7 @@ START_TEST (elm_win_policy_quit_last_window_hidden) elm_run(); Eina_Bool visible; - eo_do(win, visible = efl_gfx_visible_get()); + visible = efl_gfx_visible_get(win); ck_assert(fail_flag == EINA_FALSE); ck_assert(eo_ref_get(win) >= 1); @@ -172,8 +172,8 @@ START_TEST (elm_win_autohide_and_policy_quit_last_window_hidden) elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN); Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC); - eo_do(win, elm_obj_win_autohide_set(EINA_TRUE)); - eo_do(win, efl_gfx_visible_set(EINA_TRUE)); + elm_obj_win_autohide_set(win, EINA_TRUE); + efl_gfx_visible_set(win, EINA_TRUE); Eina_Bool fail_flag = EINA_FALSE; ecore_timer_add(_timeout1, _timer_delete_request_cb, win); @@ -182,7 +182,7 @@ START_TEST (elm_win_autohide_and_policy_quit_last_window_hidden) elm_run(); Eina_Bool visible; - eo_do(win, visible = efl_gfx_visible_get()); + visible = efl_gfx_visible_get(win); ck_assert(fail_flag == EINA_FALSE); ck_assert(eo_ref_get(win) >= 1); |