summaryrefslogtreecommitdiff
path: root/src/tests/elementary
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-04-03 13:27:30 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:24 -0700
commit9dcc31ed4a987001101177341a2e1b47a3806d6b (patch)
treef76d95e3025db2ee1bb7681937d23b385ad3a31d /src/tests/elementary
parent65ee277a6674dcad9c938b8b0ac9b56520105fc4 (diff)
Efl.Access.Object (from Efl.Access)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to '')
-rw-r--r--src/tests/elementary/elm_test_actionslider.c4
-rw-r--r--src/tests/elementary/elm_test_atspi.c160
-rw-r--r--src/tests/elementary/elm_test_box.c4
-rw-r--r--src/tests/elementary/elm_test_bubble.c4
-rw-r--r--src/tests/elementary/elm_test_button.c6
-rw-r--r--src/tests/elementary/elm_test_calendar.c4
-rw-r--r--src/tests/elementary/elm_test_check.c4
-rw-r--r--src/tests/elementary/elm_test_clock.c4
-rw-r--r--src/tests/elementary/elm_test_colorselector.c4
-rw-r--r--src/tests/elementary/elm_test_config.c2
-rw-r--r--src/tests/elementary/elm_test_conformant.c4
-rw-r--r--src/tests/elementary/elm_test_ctxpopup.c4
-rw-r--r--src/tests/elementary/elm_test_datetime.c4
-rw-r--r--src/tests/elementary/elm_test_dayselector.c4
-rw-r--r--src/tests/elementary/elm_test_diskselector.c4
-rw-r--r--src/tests/elementary/elm_test_entry.c4
-rw-r--r--src/tests/elementary/elm_test_fileselector.c4
-rw-r--r--src/tests/elementary/elm_test_fileselector_button.c4
-rw-r--r--src/tests/elementary/elm_test_fileselector_entry.c4
-rw-r--r--src/tests/elementary/elm_test_flip.c4
-rw-r--r--src/tests/elementary/elm_test_flipselector.c4
-rw-r--r--src/tests/elementary/elm_test_focus_common.h2
-rw-r--r--src/tests/elementary/elm_test_frame.c4
-rw-r--r--src/tests/elementary/elm_test_gengrid.c8
-rw-r--r--src/tests/elementary/elm_test_genlist.c20
-rw-r--r--src/tests/elementary/elm_test_glview.c4
-rw-r--r--src/tests/elementary/elm_test_grid.c4
-rw-r--r--src/tests/elementary/elm_test_hover.c4
-rw-r--r--src/tests/elementary/elm_test_hoversel.c4
-rw-r--r--src/tests/elementary/elm_test_icon.c4
-rw-r--r--src/tests/elementary/elm_test_image.c4
-rw-r--r--src/tests/elementary/elm_test_index.c4
-rw-r--r--src/tests/elementary/elm_test_inwin.c4
-rw-r--r--src/tests/elementary/elm_test_label.c4
-rw-r--r--src/tests/elementary/elm_test_layout.c4
-rw-r--r--src/tests/elementary/elm_test_list.c12
-rw-r--r--src/tests/elementary/elm_test_map.c4
-rw-r--r--src/tests/elementary/elm_test_mapbuf.c4
-rw-r--r--src/tests/elementary/elm_test_menu.c4
-rw-r--r--src/tests/elementary/elm_test_multibuttonentry.c4
-rw-r--r--src/tests/elementary/elm_test_naviframe.c4
-rw-r--r--src/tests/elementary/elm_test_notify.c4
-rw-r--r--src/tests/elementary/elm_test_panel.c4
-rw-r--r--src/tests/elementary/elm_test_panes.c4
-rw-r--r--src/tests/elementary/elm_test_photo.c4
-rw-r--r--src/tests/elementary/elm_test_photocam.c4
-rw-r--r--src/tests/elementary/elm_test_player.c4
-rw-r--r--src/tests/elementary/elm_test_plug.c4
-rw-r--r--src/tests/elementary/elm_test_popup.c4
-rw-r--r--src/tests/elementary/elm_test_prefs.c4
-rw-r--r--src/tests/elementary/elm_test_progressbar.c4
-rw-r--r--src/tests/elementary/elm_test_radio.c4
-rw-r--r--src/tests/elementary/elm_test_scroller.c4
-rw-r--r--src/tests/elementary/elm_test_segmentcontrol.c4
-rw-r--r--src/tests/elementary/elm_test_separator.c4
-rw-r--r--src/tests/elementary/elm_test_slider.c4
-rw-r--r--src/tests/elementary/elm_test_slideshow.c4
-rw-r--r--src/tests/elementary/elm_test_spinner.c4
-rw-r--r--src/tests/elementary/elm_test_table.c4
-rw-r--r--src/tests/elementary/elm_test_thumb.c4
-rw-r--r--src/tests/elementary/elm_test_toolbar.c4
-rw-r--r--src/tests/elementary/elm_test_video.c4
-rw-r--r--src/tests/elementary/elm_test_web.c4
-rw-r--r--src/tests/elementary/elm_test_win.c4
64 files changed, 219 insertions, 219 deletions
diff --git a/src/tests/elementary/elm_test_actionslider.c b/src/tests/elementary/elm_test_actionslider.c
index 38a09e5749..6adf7afc3d 100644
--- a/src/tests/elementary/elm_test_actionslider.c
+++ b/src/tests/elementary/elm_test_actionslider.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC);
35 35
36 actionslider = elm_actionslider_add(win); 36 actionslider = elm_actionslider_add(win);
37 role = efl_access_role_get(actionslider); 37 role = efl_access_object_role_get(actionslider);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_SLIDER); 39 ck_assert(role == EFL_ACCESS_ROLE_SLIDER);
40 40
diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c
index 607045bb9a..97524f4970 100644
--- a/src/tests/elementary/elm_test_atspi.c
+++ b/src/tests/elementary/elm_test_atspi.c
@@ -3,8 +3,8 @@
3#endif 3#endif
4 4
5#define ELM_INTERNAL_API_ARGESFSDFEFC 5#define ELM_INTERNAL_API_ARGESFSDFEFC
6#define EFL_ACCESS_BETA 6#define EFL_ACCESS_OBJECT_BETA
7#define EFL_ACCESS_PROTECTED 7#define EFL_ACCESS_OBJECT_PROTECTED
8 8
9#include <Elementary.h> 9#include <Elementary.h>
10#include "elm_priv.h" 10#include "elm_priv.h"
@@ -36,7 +36,7 @@ EFL_START_TEST (test_efl_access_app_obj_name_get)
36 36
37 elm_app_name_set("Test name"); 37 elm_app_name_set("Test name");
38 38
39 ret = efl_access_i18n_name_get(root); 39 ret = efl_access_object_i18n_name_get(root);
40 40
41 ck_assert_str_eq(ret, "Test name"); 41 ck_assert_str_eq(ret, "Test name");
42 42
@@ -44,13 +44,13 @@ EFL_START_TEST (test_efl_access_app_obj_name_get)
44} 44}
45EFL_END_TEST 45EFL_END_TEST
46 46
47EFL_START_TEST (test_efl_access_i18n_name_get) 47EFL_START_TEST (test_efl_access_object_i18n_name_get)
48{ 48{
49 generate_app(); 49 generate_app();
50 50
51 const char *name; 51 const char *name;
52 52
53 name = efl_access_i18n_name_get(g_btn); 53 name = efl_access_object_i18n_name_get(g_btn);
54 54
55 if (name && name[0]) { 55 if (name && name[0]) {
56 ck_assert(0); 56 ck_assert(0);
@@ -59,7 +59,7 @@ EFL_START_TEST (test_efl_access_i18n_name_get)
59 // Set name with additional text tags 59 // Set name with additional text tags
60 elm_object_text_set(g_btn, "Some<br>text"); 60 elm_object_text_set(g_btn, "Some<br>text");
61 61
62 name = efl_access_i18n_name_get(g_btn); 62 name = efl_access_object_i18n_name_get(g_btn);
63 63
64 // Accessible name should have cleared tags 64 // Accessible name should have cleared tags
65 ck_assert(name != NULL); 65 ck_assert(name != NULL);
@@ -68,22 +68,22 @@ EFL_START_TEST (test_efl_access_i18n_name_get)
68} 68}
69EFL_END_TEST 69EFL_END_TEST
70 70
71EFL_START_TEST (test_efl_access_i18n_name_set) 71EFL_START_TEST (test_efl_access_object_i18n_name_set)
72{ 72{
73 generate_app(); 73 generate_app();
74 74
75 const char *name; 75 const char *name;
76 76
77 elm_object_text_set(g_btn, "Other text"); 77 elm_object_text_set(g_btn, "Other text");
78 efl_access_i18n_name_set(g_btn, "Test name"); 78 efl_access_object_i18n_name_set(g_btn, "Test name");
79 79
80 name = efl_access_i18n_name_get(g_btn); 80 name = efl_access_object_i18n_name_get(g_btn);
81 81
82 ck_assert(name != NULL); 82 ck_assert(name != NULL);
83 ck_assert_str_eq(name, "Test name"); 83 ck_assert_str_eq(name, "Test name");
84 84
85 efl_access_i18n_name_set(g_btn, NULL); 85 efl_access_object_i18n_name_set(g_btn, NULL);
86 name = efl_access_i18n_name_get(g_btn); 86 name = efl_access_object_i18n_name_get(g_btn);
87 87
88 ck_assert(name != NULL); 88 ck_assert(name != NULL);
89 ck_assert_str_eq(name, "Other text"); 89 ck_assert_str_eq(name, "Other text");
@@ -91,13 +91,13 @@ EFL_START_TEST (test_efl_access_i18n_name_set)
91} 91}
92EFL_END_TEST 92EFL_END_TEST
93 93
94EFL_START_TEST (test_efl_access_role_get) 94EFL_START_TEST (test_efl_access_object_role_get)
95{ 95{
96 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); 96 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
97 97
98 Efl_Access_Role role; 98 Efl_Access_Role role;
99 99
100 role = efl_access_role_get(root); 100 role = efl_access_object_role_get(root);
101 101
102 ck_assert(role == EFL_ACCESS_ROLE_APPLICATION); 102 ck_assert(role == EFL_ACCESS_ROLE_APPLICATION);
103 103
@@ -105,19 +105,19 @@ EFL_START_TEST (test_efl_access_role_get)
105} 105}
106EFL_END_TEST 106EFL_END_TEST
107 107
108EFL_START_TEST (test_efl_access_role_set) 108EFL_START_TEST (test_efl_access_object_role_set)
109{ 109{
110 generate_app(); 110 generate_app();
111 Efl_Access_Role role; 111 Efl_Access_Role role;
112 112
113 efl_access_role_set(g_btn, EFL_ACCESS_ROLE_ACCELERATOR_LABEL); 113 efl_access_object_role_set(g_btn, EFL_ACCESS_ROLE_ACCELERATOR_LABEL);
114 role = efl_access_role_get(g_btn); 114 role = efl_access_object_role_get(g_btn);
115 115
116 if (role != EFL_ACCESS_ROLE_ACCELERATOR_LABEL) 116 if (role != EFL_ACCESS_ROLE_ACCELERATOR_LABEL)
117 ck_assert(0); 117 ck_assert(0);
118 118
119 efl_access_role_set(g_btn, EFL_ACCESS_ROLE_ENTRY); 119 efl_access_object_role_set(g_btn, EFL_ACCESS_ROLE_ENTRY);
120 role = efl_access_role_get(g_btn); 120 role = efl_access_object_role_get(g_btn);
121 121
122 if (role != EFL_ACCESS_ROLE_ENTRY) 122 if (role != EFL_ACCESS_ROLE_ENTRY)
123 ck_assert(0); 123 ck_assert(0);
@@ -125,13 +125,13 @@ EFL_START_TEST (test_efl_access_role_set)
125} 125}
126EFL_END_TEST 126EFL_END_TEST
127 127
128EFL_START_TEST (test_efl_access_role_name_get) 128EFL_START_TEST (test_efl_access_object_role_name_get)
129{ 129{
130 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); 130 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
131 131
132 const char *ret = NULL; 132 const char *ret = NULL;
133 133
134 ret = efl_access_role_name_get(root); 134 ret = efl_access_object_role_name_get(root);
135 135
136 ck_assert(ret != NULL); 136 ck_assert(ret != NULL);
137 137
@@ -139,13 +139,13 @@ EFL_START_TEST (test_efl_access_role_name_get)
139} 139}
140EFL_END_TEST 140EFL_END_TEST
141 141
142EFL_START_TEST (test_efl_access_localized_role_name_get) 142EFL_START_TEST (test_efl_access_object_localized_role_name_get)
143{ 143{
144 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); 144 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
145 145
146 const char *ret = NULL; 146 const char *ret = NULL;
147 147
148 ret = efl_access_localized_role_name_get(root); 148 ret = efl_access_object_localized_role_name_get(root);
149 149
150 ck_assert(ret != NULL); 150 ck_assert(ret != NULL);
151 151
@@ -153,7 +153,7 @@ EFL_START_TEST (test_efl_access_localized_role_name_get)
153} 153}
154EFL_END_TEST 154EFL_END_TEST
155 155
156EFL_START_TEST (test_efl_access_description_set) 156EFL_START_TEST (test_efl_access_object_description_set)
157{ 157{
158 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get()); 158 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
159 159
@@ -161,18 +161,18 @@ EFL_START_TEST (test_efl_access_description_set)
161 161
162 const char *desc = "Test description"; 162 const char *desc = "Test description";
163 163
164 ret = efl_access_description_get(root); 164 ret = efl_access_object_description_get(root);
165 165
166 ck_assert(ret == NULL); 166 ck_assert(ret == NULL);
167 167
168 efl_access_description_set(root, desc); 168 efl_access_object_description_set(root, desc);
169 ret = efl_access_description_get(root); 169 ret = efl_access_object_description_get(root);
170 170
171 ck_assert(ret != NULL); 171 ck_assert(ret != NULL);
172 ck_assert_str_eq(ret, "Test description"); 172 ck_assert_str_eq(ret, "Test description");
173 173
174 efl_access_description_set(root, NULL); 174 efl_access_object_description_set(root, NULL);
175 ret = efl_access_description_get(root); 175 ret = efl_access_object_description_get(root);
176 176
177 ck_assert(ret == NULL); 177 ck_assert(ret == NULL);
178 178
@@ -181,12 +181,12 @@ EFL_START_TEST (test_efl_access_description_set)
181EFL_END_TEST 181EFL_END_TEST
182 182
183/* Test if initial description value is NULL */ 183/* Test if initial description value is NULL */
184EFL_START_TEST (test_efl_access_description_get) 184EFL_START_TEST (test_efl_access_object_description_get)
185{ 185{
186 generate_app(); 186 generate_app();
187 187
188 const char *descr; 188 const char *descr;
189 descr = efl_access_description_get(g_bg); 189 descr = efl_access_object_description_get(g_bg);
190 190
191 ck_assert(descr == NULL); 191 ck_assert(descr == NULL);
192 192
@@ -200,9 +200,9 @@ EFL_START_TEST (test_efl_access_children_and_parent)
200 200
201 Eina_List *child_list = NULL; 201 Eina_List *child_list = NULL;
202 202
203 child_list = efl_access_children_get(root); 203 child_list = efl_access_object_access_children_get(root);
204 204
205 //bg_child_list = efl_access_children_get(eina_list_nth(child_list, 0)); 205 //bg_child_list = efl_access_object_access_children_get(eina_list_nth(child_list, 0));
206 206
207 ck_assert(eina_list_count(child_list) == 1); 207 ck_assert(eina_list_count(child_list) == 1);
208 208
@@ -225,11 +225,11 @@ EFL_START_TEST (test_efl_access_children_and_parent2)
225 Eo *win = NULL; 225 Eo *win = NULL;
226 226
227 Eina_List *root_children; 227 Eina_List *root_children;
228 root_children = efl_access_children_get(root); 228 root_children = efl_access_object_access_children_get(root);
229 win = eina_list_nth(root_children, 0); 229 win = eina_list_nth(root_children, 0);
230 230
231 Eina_List *win_children; 231 Eina_List *win_children;
232 win_children = efl_access_children_get(win); 232 win_children = efl_access_object_access_children_get(win);
233 233
234 ck_assert(eina_list_count(win_children) == 1); 234 ck_assert(eina_list_count(win_children) == 1);
235 235
@@ -244,40 +244,40 @@ EFL_START_TEST (test_efl_access_children_and_parent2)
244EFL_END_TEST 244EFL_END_TEST
245 245
246/* Initial value of translation domain should be NULL */ 246/* Initial value of translation domain should be NULL */
247EFL_START_TEST (test_efl_access_translation_domain_get) 247EFL_START_TEST (test_efl_access_object_translation_domain_get)
248{ 248{
249 generate_app(); 249 generate_app();
250 250
251 const char *domain; 251 const char *domain;
252 252
253 domain = efl_access_translation_domain_get(g_btn); 253 domain = efl_access_object_translation_domain_get(g_btn);
254 254
255 ck_assert(domain == NULL); 255 ck_assert(domain == NULL);
256 256
257} 257}
258EFL_END_TEST 258EFL_END_TEST
259 259
260EFL_START_TEST (test_efl_access_translation_domain_set) 260EFL_START_TEST (test_efl_access_object_translation_domain_set)
261{ 261{
262 generate_app(); 262 generate_app();
263 263
264 const char *domain; 264 const char *domain;
265 265
266 efl_access_translation_domain_set(g_btn, "Test translation_domain"); 266 efl_access_object_translation_domain_set(g_btn, "Test translation_domain");
267 domain = efl_access_translation_domain_get(g_btn); 267 domain = efl_access_object_translation_domain_get(g_btn);
268 268
269 ck_assert(domain != NULL); 269 ck_assert(domain != NULL);
270 ck_assert_str_eq(domain, "Test translation_domain"); 270 ck_assert_str_eq(domain, "Test translation_domain");
271 271
272 efl_access_translation_domain_set(g_btn, NULL); 272 efl_access_object_translation_domain_set(g_btn, NULL);
273 domain = efl_access_translation_domain_get(g_btn); 273 domain = efl_access_object_translation_domain_get(g_btn);
274 274
275 ck_assert(domain == NULL); 275 ck_assert(domain == NULL);
276 276
277} 277}
278EFL_END_TEST 278EFL_END_TEST
279 279
280EFL_START_TEST (test_efl_access_relationship_append) 280EFL_START_TEST (test_efl_access_object_relationship_append)
281{ 281{
282 generate_app(); 282 generate_app();
283 283
@@ -285,9 +285,9 @@ EFL_START_TEST (test_efl_access_relationship_append)
285 Efl_Access_Relation *rel, *rel_to, *rel_from; 285 Efl_Access_Relation *rel, *rel_to, *rel_from;
286 Eina_List *l; 286 Eina_List *l;
287 287
288 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); 288 efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
289 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); 289 efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win);
290 set = efl_access_relation_set_get(g_btn); 290 set = efl_access_object_relation_set_get(g_btn);
291 291
292 ck_assert(set != NULL); 292 ck_assert(set != NULL);
293 ck_assert(eina_list_count(set) >= 2); 293 ck_assert(eina_list_count(set) >= 2);
@@ -310,9 +310,9 @@ EFL_START_TEST (test_efl_access_relationship_append)
310 efl_access_relation_set_free(set); 310 efl_access_relation_set_free(set);
311 311
312 /* Check if append do not procude duplicated relations */ 312 /* Check if append do not procude duplicated relations */
313 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); 313 efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
314 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); 314 efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win);
315 set = efl_access_relation_set_get(g_btn); 315 set = efl_access_object_relation_set_get(g_btn);
316 316
317 rel_to = rel_from = NULL; 317 rel_to = rel_from = NULL;
318 EINA_LIST_FOREACH(set, l, rel) 318 EINA_LIST_FOREACH(set, l, rel)
@@ -338,7 +338,7 @@ EFL_START_TEST (test_efl_access_relationship_append)
338} 338}
339EFL_END_TEST 339EFL_END_TEST
340 340
341EFL_START_TEST (test_efl_access_relationship_remove) 341EFL_START_TEST (test_efl_access_object_relationship_remove)
342{ 342{
343 generate_app(); 343 generate_app();
344 344
@@ -347,10 +347,10 @@ EFL_START_TEST (test_efl_access_relationship_remove)
347 Eina_List *l; 347 Eina_List *l;
348 348
349 /* Test if removal of single relationship works */ 349 /* Test if removal of single relationship works */
350 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); 350 efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
351 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); 351 efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win);
352 efl_access_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); 352 efl_access_object_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
353 set = efl_access_relation_set_get(g_btn); 353 set = efl_access_object_relation_set_get(g_btn);
354 354
355 ck_assert(set != NULL); 355 ck_assert(set != NULL);
356 ck_assert(eina_list_count(set) >= 1); 356 ck_assert(eina_list_count(set) >= 1);
@@ -371,10 +371,10 @@ EFL_START_TEST (test_efl_access_relationship_remove)
371 efl_access_relation_set_free(set); 371 efl_access_relation_set_free(set);
372 372
373 /* Test if removal of type relationship works */ 373 /* Test if removal of type relationship works */
374 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); 374 efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
375 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win); 375 efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win);
376 efl_access_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, NULL); 376 efl_access_object_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, NULL);
377 set = efl_access_relation_set_get(g_btn); 377 set = efl_access_object_relation_set_get(g_btn);
378 378
379 rel_to = rel_from = NULL; 379 rel_to = rel_from = NULL;
380 EINA_LIST_FOREACH(set, l, rel) 380 EINA_LIST_FOREACH(set, l, rel)
@@ -392,10 +392,10 @@ EFL_START_TEST (test_efl_access_relationship_remove)
392 efl_access_relation_set_free(set); 392 efl_access_relation_set_free(set);
393 393
394 /* Test if relationship is implicity removed when object is deleted */ 394 /* Test if relationship is implicity removed when object is deleted */
395 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); 395 efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
396 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg); 396 efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg);
397 efl_del(g_bg); 397 efl_del(g_bg);
398 set = efl_access_relation_set_get(g_btn); 398 set = efl_access_object_relation_set_get(g_btn);
399 399
400 rel_to = rel_from = NULL; 400 rel_to = rel_from = NULL;
401 EINA_LIST_FOREACH(set, l, rel) 401 EINA_LIST_FOREACH(set, l, rel)
@@ -413,7 +413,7 @@ EFL_START_TEST (test_efl_access_relationship_remove)
413} 413}
414EFL_END_TEST 414EFL_END_TEST
415 415
416EFL_START_TEST (test_efl_access_relationships_clear) 416EFL_START_TEST (test_efl_access_object_relationships_clear)
417{ 417{
418 Efl_Access_Relation_Set set; 418 Efl_Access_Relation_Set set;
419 Efl_Access_Relation *rel; 419 Efl_Access_Relation *rel;
@@ -421,14 +421,14 @@ EFL_START_TEST (test_efl_access_relationships_clear)
421 421
422 generate_app(); 422 generate_app();
423 423
424 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg); 424 efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
425 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg); 425 efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg);
426 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win); 426 efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win);
427 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win); 427 efl_access_object_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win);
428 428
429 efl_access_relationships_clear(g_btn); 429 efl_access_object_relationships_clear(g_btn);
430 430
431 set = efl_access_relation_set_get(g_btn); 431 set = efl_access_object_relation_set_get(g_btn);
432 EINA_LIST_FOREACH(set, l, rel) 432 EINA_LIST_FOREACH(set, l, rel)
433 { 433 {
434 ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_bg))); 434 ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_bg)));
@@ -444,19 +444,19 @@ EFL_END_TEST
444void elm_test_atspi(TCase *tc) 444void elm_test_atspi(TCase *tc)
445{ 445{
446 tcase_add_test(tc, test_efl_access_app_obj_name_get); 446 tcase_add_test(tc, test_efl_access_app_obj_name_get);
447 tcase_add_test(tc, test_efl_access_i18n_name_get); 447 tcase_add_test(tc, test_efl_access_object_i18n_name_get);
448 tcase_add_test(tc, test_efl_access_i18n_name_set); 448 tcase_add_test(tc, test_efl_access_object_i18n_name_set);
449 tcase_add_test(tc, test_efl_access_role_get); 449 tcase_add_test(tc, test_efl_access_object_role_get);
450 tcase_add_test(tc, test_efl_access_role_set); 450 tcase_add_test(tc, test_efl_access_object_role_set);
451 tcase_add_test(tc, test_efl_access_role_name_get); 451 tcase_add_test(tc, test_efl_access_object_role_name_get);
452 tcase_add_test(tc, test_efl_access_localized_role_name_get); 452 tcase_add_test(tc, test_efl_access_object_localized_role_name_get);
453 tcase_add_test(tc, test_efl_access_description_set); 453 tcase_add_test(tc, test_efl_access_object_description_set);
454 tcase_add_test(tc, test_efl_access_description_get); 454 tcase_add_test(tc, test_efl_access_object_description_get);
455 tcase_add_test(tc, test_efl_access_children_and_parent); 455 tcase_add_test(tc, test_efl_access_children_and_parent);
456 tcase_add_test(tc, test_efl_access_children_and_parent2); 456 tcase_add_test(tc, test_efl_access_children_and_parent2);
457 tcase_add_test(tc, test_efl_access_translation_domain_get); 457 tcase_add_test(tc, test_efl_access_object_translation_domain_get);
458 tcase_add_test(tc, test_efl_access_translation_domain_set); 458 tcase_add_test(tc, test_efl_access_object_translation_domain_set);
459 tcase_add_test(tc, test_efl_access_relationship_append); 459 tcase_add_test(tc, test_efl_access_object_relationship_append);
460 tcase_add_test(tc, test_efl_access_relationship_remove); 460 tcase_add_test(tc, test_efl_access_object_relationship_remove);
461 tcase_add_test(tc, test_efl_access_relationships_clear); 461 tcase_add_test(tc, test_efl_access_object_relationships_clear);
462} 462}
diff --git a/src/tests/elementary/elm_test_box.c b/src/tests/elementary/elm_test_box.c
index becfb98f7b..86e27c8862 100644
--- a/src/tests/elementary/elm_test_box.c
+++ b/src/tests/elementary/elm_test_box.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "box", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "box", ELM_WIN_BASIC);
35 35
36 box = elm_box_add(win); 36 box = elm_box_add(win);
37 role = efl_access_role_get(box); 37 role = efl_access_object_role_get(box);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_FILLER); 39 ck_assert(role == EFL_ACCESS_ROLE_FILLER);
40 40
diff --git a/src/tests/elementary/elm_test_bubble.c b/src/tests/elementary/elm_test_bubble.c
index 485ac91ef9..dea1552c9c 100644
--- a/src/tests/elementary/elm_test_bubble.c
+++ b/src/tests/elementary/elm_test_bubble.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC);
35 35
36 bubble = elm_bubble_add(win); 36 bubble = elm_bubble_add(win);
37 role = efl_access_role_get(bubble); 37 role = efl_access_object_role_get(bubble);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_FILLER); 39 ck_assert(role == EFL_ACCESS_ROLE_FILLER);
40 40
diff --git a/src/tests/elementary/elm_test_button.c b/src/tests/elementary/elm_test_button.c
index ee49bb98f1..99f15ef90b 100644
--- a/src/tests/elementary/elm_test_button.c
+++ b/src/tests/elementary/elm_test_button.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#define EFL_ACCESS_COMPONENT_PROTECTED 6#define EFL_ACCESS_COMPONENT_PROTECTED
7#define EFL_ACCESS_ACTION_PROTECTED 7#define EFL_ACCESS_ACTION_PROTECTED
8#include <Elementary.h> 8#include <Elementary.h>
@@ -36,7 +36,7 @@ EFL_START_TEST (elm_atspi_role_get)
36 win = elm_win_add(NULL, "button", ELM_WIN_BASIC); 36 win = elm_win_add(NULL, "button", ELM_WIN_BASIC);
37 37
38 button = elm_button_add(win); 38 button = elm_button_add(win);
39 role = efl_access_role_get(button); 39 role = efl_access_object_role_get(button);
40 40
41 ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON); 41 ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON);
42 42
@@ -51,7 +51,7 @@ EFL_START_TEST (elm_atspi_interfaces_check)
51 51
52 button = elm_button_add(win); 52 button = elm_button_add(win);
53 53
54 ck_assert(efl_isa(button, EFL_ACCESS_MIXIN)); 54 ck_assert(efl_isa(button, EFL_ACCESS_OBJECT_MIXIN));
55 ck_assert(efl_isa(button, EFL_ACCESS_COMPONENT_MIXIN)); 55 ck_assert(efl_isa(button, EFL_ACCESS_COMPONENT_MIXIN));
56 ck_assert(efl_isa(button, EFL_ACCESS_ACTION_MIXIN)); 56 ck_assert(efl_isa(button, EFL_ACCESS_ACTION_MIXIN));
57 57
diff --git a/src/tests/elementary/elm_test_calendar.c b/src/tests/elementary/elm_test_calendar.c
index 90da2ffac8..8ac4d3d937 100644
--- a/src/tests/elementary/elm_test_calendar.c
+++ b/src/tests/elementary/elm_test_calendar.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC);
35 35
36 calendar = elm_calendar_add(win); 36 calendar = elm_calendar_add(win);
37 role = efl_access_role_get(calendar); 37 role = efl_access_object_role_get(calendar);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_CALENDAR); 39 ck_assert(role == EFL_ACCESS_ROLE_CALENDAR);
40 40
diff --git a/src/tests/elementary/elm_test_check.c b/src/tests/elementary/elm_test_check.c
index 486475f79b..243c38e591 100644
--- a/src/tests/elementary/elm_test_check.c
+++ b/src/tests/elementary/elm_test_check.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -74,7 +74,7 @@ EFL_START_TEST (elm_atspi_role_get)
74 win = elm_win_add(NULL, "check", ELM_WIN_BASIC); 74 win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
75 75
76 check = elm_check_add(win); 76 check = elm_check_add(win);
77 role = efl_access_role_get(check); 77 role = efl_access_object_role_get(check);
78 78
79 ck_assert(role == EFL_ACCESS_ROLE_CHECK_BOX); 79 ck_assert(role == EFL_ACCESS_ROLE_CHECK_BOX);
80 80
diff --git a/src/tests/elementary/elm_test_clock.c b/src/tests/elementary/elm_test_clock.c
index e1827a9830..568cb5b883 100644
--- a/src/tests/elementary/elm_test_clock.c
+++ b/src/tests/elementary/elm_test_clock.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "clock", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "clock", ELM_WIN_BASIC);
35 35
36 clk = elm_clock_add(win); 36 clk = elm_clock_add(win);
37 role = efl_access_role_get(clk); 37 role = efl_access_object_role_get(clk);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_TEXT); 39 ck_assert(role == EFL_ACCESS_ROLE_TEXT);
40 40
diff --git a/src/tests/elementary/elm_test_colorselector.c b/src/tests/elementary/elm_test_colorselector.c
index 5e4c78151e..bc7a055934 100644
--- a/src/tests/elementary/elm_test_colorselector.c
+++ b/src/tests/elementary/elm_test_colorselector.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -59,7 +59,7 @@ EFL_START_TEST (elm_atspi_role_get)
59 win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC); 59 win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC);
60 60
61 c = elm_colorselector_add(win); 61 c = elm_colorselector_add(win);
62 role = efl_access_role_get(c); 62 role = efl_access_object_role_get(c);
63 63
64 ck_assert(role == EFL_ACCESS_ROLE_COLOR_CHOOSER); 64 ck_assert(role == EFL_ACCESS_ROLE_COLOR_CHOOSER);
65 65
diff --git a/src/tests/elementary/elm_test_config.c b/src/tests/elementary/elm_test_config.c
index c69b53340c..2edab80b51 100644
--- a/src/tests/elementary/elm_test_config.c
+++ b/src/tests/elementary/elm_test_config.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_PROTECTED 5#define EFL_ACCESS_OBJECT_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
diff --git a/src/tests/elementary/elm_test_conformant.c b/src/tests/elementary/elm_test_conformant.c
index befb99727e..5bd0454c03 100644
--- a/src/tests/elementary/elm_test_conformant.c
+++ b/src/tests/elementary/elm_test_conformant.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC);
35 35
36 conformant = elm_conformant_add(win); 36 conformant = elm_conformant_add(win);
37 role = efl_access_role_get(conformant); 37 role = efl_access_object_role_get(conformant);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_FILLER); 39 ck_assert(role == EFL_ACCESS_ROLE_FILLER);
40 40
diff --git a/src/tests/elementary/elm_test_ctxpopup.c b/src/tests/elementary/elm_test_ctxpopup.c
index 053a5ad2ac..7d482b8f8d 100644
--- a/src/tests/elementary/elm_test_ctxpopup.c
+++ b/src/tests/elementary/elm_test_ctxpopup.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
35 35
36 ctxpopup = elm_ctxpopup_add(win); 36 ctxpopup = elm_ctxpopup_add(win);
37 role = efl_access_role_get(ctxpopup); 37 role = efl_access_object_role_get(ctxpopup);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_POPUP_MENU); 39 ck_assert(role == EFL_ACCESS_ROLE_POPUP_MENU);
40 40
diff --git a/src/tests/elementary/elm_test_datetime.c b/src/tests/elementary/elm_test_datetime.c
index 3c614c9a59..3f35de79d2 100644
--- a/src/tests/elementary/elm_test_datetime.c
+++ b/src/tests/elementary/elm_test_datetime.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "datetime", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "datetime", ELM_WIN_BASIC);
35 35
36 datetime = elm_datetime_add(win); 36 datetime = elm_datetime_add(win);
37 role = efl_access_role_get(datetime); 37 role = efl_access_object_role_get(datetime);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_DATE_EDITOR); 39 ck_assert(role == EFL_ACCESS_ROLE_DATE_EDITOR);
40 40
diff --git a/src/tests/elementary/elm_test_dayselector.c b/src/tests/elementary/elm_test_dayselector.c
index 1c3b480c02..c92eb8fe28 100644
--- a/src/tests/elementary/elm_test_dayselector.c
+++ b/src/tests/elementary/elm_test_dayselector.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC);
35 35
36 dayselector = elm_dayselector_add(win); 36 dayselector = elm_dayselector_add(win);
37 role = efl_access_role_get(dayselector); 37 role = efl_access_object_role_get(dayselector);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_PANEL); 39 ck_assert(role == EFL_ACCESS_ROLE_PANEL);
40 40
diff --git a/src/tests/elementary/elm_test_diskselector.c b/src/tests/elementary/elm_test_diskselector.c
index fcf95ef4b8..19162cd0aa 100644
--- a/src/tests/elementary/elm_test_diskselector.c
+++ b/src/tests/elementary/elm_test_diskselector.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC);
35 35
36 diskselector = elm_diskselector_add(win); 36 diskselector = elm_diskselector_add(win);
37 role = efl_access_role_get(diskselector); 37 role = efl_access_object_role_get(diskselector);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_LIST); 39 ck_assert(role == EFL_ACCESS_ROLE_LIST);
40 40
diff --git a/src/tests/elementary/elm_test_entry.c b/src/tests/elementary/elm_test_entry.c
index 9be9da6686..3fde6b9a7a 100644
--- a/src/tests/elementary/elm_test_entry.c
+++ b/src/tests/elementary/elm_test_entry.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#define EFL_ACCESS_TEXT_BETA 6#define EFL_ACCESS_TEXT_BETA
7#define EFL_ACCESS_TEXT_PROTECTED 7#define EFL_ACCESS_TEXT_PROTECTED
8#include <Elementary.h> 8#include <Elementary.h>
@@ -386,7 +386,7 @@ EFL_START_TEST (elm_atspi_role_get)
386 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 386 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC);
387 387
388 entry = elm_entry_add(win); 388 entry = elm_entry_add(win);
389 role = efl_access_role_get(entry); 389 role = efl_access_object_role_get(entry);
390 390
391 ck_assert(role == EFL_ACCESS_ROLE_ENTRY); 391 ck_assert(role == EFL_ACCESS_ROLE_ENTRY);
392 392
diff --git a/src/tests/elementary/elm_test_fileselector.c b/src/tests/elementary/elm_test_fileselector.c
index 096cf368d7..d62ee349f4 100644
--- a/src/tests/elementary/elm_test_fileselector.c
+++ b/src/tests/elementary/elm_test_fileselector.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC);
35 35
36 fileselector = elm_fileselector_add(win); 36 fileselector = elm_fileselector_add(win);
37 role = efl_access_role_get(fileselector); 37 role = efl_access_object_role_get(fileselector);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_FILE_CHOOSER); 39 ck_assert(role == EFL_ACCESS_ROLE_FILE_CHOOSER);
40 40
diff --git a/src/tests/elementary/elm_test_fileselector_button.c b/src/tests/elementary/elm_test_fileselector_button.c
index 9079860569..5d315d903b 100644
--- a/src/tests/elementary/elm_test_fileselector_button.c
+++ b/src/tests/elementary/elm_test_fileselector_button.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "fileselector_button", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "fileselector_button", ELM_WIN_BASIC);
35 35
36 fs_button = elm_fileselector_button_add(win); 36 fs_button = elm_fileselector_button_add(win);
37 role = efl_access_role_get(fs_button); 37 role = efl_access_object_role_get(fs_button);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON); 39 ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON);
40 40
diff --git a/src/tests/elementary/elm_test_fileselector_entry.c b/src/tests/elementary/elm_test_fileselector_entry.c
index 42af79700b..9d7cfc40e2 100644
--- a/src/tests/elementary/elm_test_fileselector_entry.c
+++ b/src/tests/elementary/elm_test_fileselector_entry.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "fileselectorentry", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "fileselectorentry", ELM_WIN_BASIC);
35 35
36 fs_entry = elm_fileselector_entry_add(win); 36 fs_entry = elm_fileselector_entry_add(win);
37 role = efl_access_role_get(fs_entry); 37 role = efl_access_object_role_get(fs_entry);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_GROUPING); 39 ck_assert(role == EFL_ACCESS_ROLE_GROUPING);
40 40
diff --git a/src/tests/elementary/elm_test_flip.c b/src/tests/elementary/elm_test_flip.c
index 4d87dfa00d..661105d0bc 100644
--- a/src/tests/elementary/elm_test_flip.c
+++ b/src/tests/elementary/elm_test_flip.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "flip", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "flip", ELM_WIN_BASIC);
35 35
36 flip = elm_flip_add(win); 36 flip = elm_flip_add(win);
37 role = efl_access_role_get(flip); 37 role = efl_access_object_role_get(flip);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_PAGE_TAB_LIST); 39 ck_assert(role == EFL_ACCESS_ROLE_PAGE_TAB_LIST);
40 40
diff --git a/src/tests/elementary/elm_test_flipselector.c b/src/tests/elementary/elm_test_flipselector.c
index 40523b73bc..ba15290f50 100644
--- a/src/tests/elementary/elm_test_flipselector.c
+++ b/src/tests/elementary/elm_test_flipselector.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC);
35 35
36 flipselector = elm_flipselector_add(win); 36 flipselector = elm_flipselector_add(win);
37 role = efl_access_role_get(flipselector); 37 role = efl_access_object_role_get(flipselector);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_LIST); 39 ck_assert(role == EFL_ACCESS_ROLE_LIST);
40 40
diff --git a/src/tests/elementary/elm_test_focus_common.h b/src/tests/elementary/elm_test_focus_common.h
index 7105d7f736..bfce152cc3 100644
--- a/src/tests/elementary/elm_test_focus_common.h
+++ b/src/tests/elementary/elm_test_focus_common.h
@@ -5,7 +5,7 @@
5# include "elementary_config.h" 5# include "elementary_config.h"
6#endif 6#endif
7 7
8#define EFL_ACCESS_PROTECTED 8#define EFL_ACCESS_OBJECT_PROTECTED
9#define ELM_INTERNAL_API_ARGESFSDFEFC 9#define ELM_INTERNAL_API_ARGESFSDFEFC
10#include <Elementary.h> 10#include <Elementary.h>
11#include "elm_suite.h" 11#include "elm_suite.h"
diff --git a/src/tests/elementary/elm_test_frame.c b/src/tests/elementary/elm_test_frame.c
index d6ca3fedf9..0d0492a99d 100644
--- a/src/tests/elementary/elm_test_frame.c
+++ b/src/tests/elementary/elm_test_frame.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "frame", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "frame", ELM_WIN_BASIC);
35 35
36 frame = elm_frame_add(win); 36 frame = elm_frame_add(win);
37 role = efl_access_role_get(frame); 37 role = efl_access_object_role_get(frame);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_FRAME); 39 ck_assert(role == EFL_ACCESS_ROLE_FRAME);
40 40
diff --git a/src/tests/elementary/elm_test_gengrid.c b/src/tests/elementary/elm_test_gengrid.c
index 85fe9af940..9134b2fe67 100644
--- a/src/tests/elementary/elm_test_gengrid.c
+++ b/src/tests/elementary/elm_test_gengrid.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8#include "elm_test_helper.h" 8#include "elm_test_helper.h"
@@ -35,7 +35,7 @@ EFL_START_TEST (elm_atspi_role_get)
35 win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC); 35 win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC);
36 36
37 gengrid = elm_gengrid_add(win); 37 gengrid = elm_gengrid_add(win);
38 role = efl_access_role_get(gengrid); 38 role = efl_access_object_role_get(gengrid);
39 39
40 ck_assert(role == EFL_ACCESS_ROLE_TREE_TABLE); 40 ck_assert(role == EFL_ACCESS_ROLE_TREE_TABLE);
41 41
@@ -69,7 +69,7 @@ EFL_START_TEST(elm_atspi_children_parent)
69 Evas_Object *gengrid = elm_gengrid_add(win); 69 Evas_Object *gengrid = elm_gengrid_add(win);
70 evas_object_resize(gengrid, 100, 100); 70 evas_object_resize(gengrid, 100, 100);
71 71
72 Efl_Access *parent; 72 Efl_Access_Object *parent;
73 content = NULL; 73 content = NULL;
74 74
75 itc.item_style = "default"; 75 itc.item_style = "default";
@@ -82,7 +82,7 @@ EFL_START_TEST(elm_atspi_children_parent)
82 elm_gengrid_item_fields_update(it, "*.", ELM_GENGRID_ITEM_FIELD_CONTENT); 82 elm_gengrid_item_fields_update(it, "*.", ELM_GENGRID_ITEM_FIELD_CONTENT);
83 83
84 ck_assert(content != NULL); 84 ck_assert(content != NULL);
85 parent = efl_provider_find(efl_parent_get(content), EFL_ACCESS_MIXIN); 85 parent = efl_provider_find(efl_parent_get(content), EFL_ACCESS_OBJECT_MIXIN);
86 ck_assert(it == parent); 86 ck_assert(it == parent);
87 87
88} 88}
diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c
index fd346364e8..74b7575c5b 100644
--- a/src/tests/elementary/elm_test_genlist.c
+++ b/src/tests/elementary/elm_test_genlist.c
@@ -2,8 +2,8 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#define EFL_ACCESS_PROTECTED 6#define EFL_ACCESS_OBJECT_PROTECTED
7#include <Elementary.h> 7#include <Elementary.h>
8#include "elm_suite.h" 8#include "elm_suite.h"
9 9
@@ -103,7 +103,7 @@ EFL_START_TEST (elm_atspi_role_get)
103 103
104 Efl_Access_Role role; 104 Efl_Access_Role role;
105 105
106 role = efl_access_role_get(genlist); 106 role = efl_access_object_role_get(genlist);
107 107
108 ck_assert(role == EFL_ACCESS_ROLE_LIST); 108 ck_assert(role == EFL_ACCESS_ROLE_LIST);
109 109
@@ -116,14 +116,14 @@ EFL_START_TEST(elm_atspi_children_get1)
116 Eina_List *children; 116 Eina_List *children;
117 Elm_Object_Item *it[3]; 117 Elm_Object_Item *it[3];
118 118
119 children = efl_access_children_get(genlist); 119 children = efl_access_object_access_children_get(genlist);
120 ck_assert(children == NULL); 120 ck_assert(children == NULL);
121 121
122 it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); 122 it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
123 it[1] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); 123 it[1] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
124 it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); 124 it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
125 125
126 children = efl_access_children_get(genlist); 126 children = efl_access_object_access_children_get(genlist);
127 ck_assert(eina_list_count(children) == 3); 127 ck_assert(eina_list_count(children) == 3);
128 ck_assert(eina_list_nth(children, 0) == it[0]); 128 ck_assert(eina_list_nth(children, 0) == it[0]);
129 ck_assert(eina_list_nth(children, 1) == it[1]); 129 ck_assert(eina_list_nth(children, 1) == it[1]);
@@ -144,7 +144,7 @@ EFL_START_TEST(elm_atspi_children_get2)
144 it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_GROUP, NULL, NULL); 144 it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_GROUP, NULL, NULL);
145 it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL); 145 it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL);
146 146
147 children = efl_access_children_get(genlist); 147 children = efl_access_object_access_children_get(genlist);
148 ck_assert(eina_list_nth(children, 1) == it[0]); 148 ck_assert(eina_list_nth(children, 1) == it[0]);
149 ck_assert(eina_list_nth(children, 0) == it[1]); 149 ck_assert(eina_list_nth(children, 0) == it[1]);
150 ck_assert(eina_list_nth(children, 2) == it[2]); 150 ck_assert(eina_list_nth(children, 2) == it[2]);
@@ -155,7 +155,7 @@ EFL_END_TEST
155static void 155static void
156_children_changed_cb(void *data EINA_UNUSED, const Efl_Event *event) 156_children_changed_cb(void *data EINA_UNUSED, const Efl_Event *event)
157{ 157{
158 if (event->desc != EFL_ACCESS_EVENT_CHILDREN_CHANGED) 158 if (event->desc != EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED)
159 return; 159 return;
160 160
161 ev_data = *(Efl_Access_Event_Children_Changed_Data*)event->info; 161 ev_data = *(Efl_Access_Event_Children_Changed_Data*)event->info;
@@ -172,7 +172,7 @@ EFL_START_TEST(elm_atspi_children_events_add)
172 172
173 Elm_Object_Item *it[3]; 173 Elm_Object_Item *it[3];
174 174
175 efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL); 175 efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _children_changed_cb, NULL);
176 176
177 it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); 177 it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
178 ck_assert(genlist == current); 178 ck_assert(genlist == current);
@@ -208,7 +208,7 @@ EFL_START_TEST(elm_atspi_children_events_del1)
208 it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); 208 it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
209 it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL); 209 it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL);
210 210
211 efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL); 211 efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _children_changed_cb, NULL);
212 212
213 elm_object_item_del(it[0]); 213 elm_object_item_del(it[0]);
214 ck_assert(genlist == current); 214 ck_assert(genlist == current);
@@ -235,7 +235,7 @@ EFL_START_TEST(elm_atspi_children_events_del2)
235 235
236 it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); 236 it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
237 237
238 efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL); 238 efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _children_changed_cb, NULL);
239 elm_genlist_clear(genlist); 239 elm_genlist_clear(genlist);
240 240
241 ck_assert(genlist == current); 241 ck_assert(genlist == current);
diff --git a/src/tests/elementary/elm_test_glview.c b/src/tests/elementary/elm_test_glview.c
index 4d8525c234..7c38e4584c 100644
--- a/src/tests/elementary/elm_test_glview.c
+++ b/src/tests/elementary/elm_test_glview.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -41,7 +41,7 @@ EFL_START_TEST (elm_atspi_role_get)
41 // if no gl backend skip test 41 // if no gl backend skip test
42 if (glview) 42 if (glview)
43 { 43 {
44 role = efl_access_role_get(glview); 44 role = efl_access_object_role_get(glview);
45 ck_assert(role == EFL_ACCESS_ROLE_ANIMATION); 45 ck_assert(role == EFL_ACCESS_ROLE_ANIMATION);
46 } 46 }
47 47
diff --git a/src/tests/elementary/elm_test_grid.c b/src/tests/elementary/elm_test_grid.c
index ec08a3659b..f7c74e020a 100644
--- a/src/tests/elementary/elm_test_grid.c
+++ b/src/tests/elementary/elm_test_grid.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "grid", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "grid", ELM_WIN_BASIC);
35 35
36 grid = elm_grid_add(win); 36 grid = elm_grid_add(win);
37 role = efl_access_role_get(grid); 37 role = efl_access_object_role_get(grid);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_FILLER); 39 ck_assert(role == EFL_ACCESS_ROLE_FILLER);
40 40
diff --git a/src/tests/elementary/elm_test_hover.c b/src/tests/elementary/elm_test_hover.c
index b3660ff5b8..4455f87692 100644
--- a/src/tests/elementary/elm_test_hover.c
+++ b/src/tests/elementary/elm_test_hover.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "hover", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "hover", ELM_WIN_BASIC);
35 35
36 hover = elm_hover_add(win); 36 hover = elm_hover_add(win);
37 role = efl_access_role_get(hover); 37 role = efl_access_object_role_get(hover);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_POPUP_MENU); 39 ck_assert(role == EFL_ACCESS_ROLE_POPUP_MENU);
40 40
diff --git a/src/tests/elementary/elm_test_hoversel.c b/src/tests/elementary/elm_test_hoversel.c
index 1e22955d53..cf27c0abda 100644
--- a/src/tests/elementary/elm_test_hoversel.c
+++ b/src/tests/elementary/elm_test_hoversel.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC);
35 35
36 hoversel = elm_hoversel_add(win); 36 hoversel = elm_hoversel_add(win);
37 role = efl_access_role_get(hoversel); 37 role = efl_access_object_role_get(hoversel);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON); 39 ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON);
40 40
diff --git a/src/tests/elementary/elm_test_icon.c b/src/tests/elementary/elm_test_icon.c
index afd747a9aa..1b9aa33a3e 100644
--- a/src/tests/elementary/elm_test_icon.c
+++ b/src/tests/elementary/elm_test_icon.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
35 35
36 icon = elm_icon_add(win); 36 icon = elm_icon_add(win);
37 role = efl_access_role_get(icon); 37 role = efl_access_object_role_get(icon);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_ICON); 39 ck_assert(role == EFL_ACCESS_ROLE_ICON);
40 40
diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c
index 8e4c791ba3..0efb0e4a76 100644
--- a/src/tests/elementary/elm_test_image.c
+++ b/src/tests/elementary/elm_test_image.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -45,7 +45,7 @@ EFL_START_TEST (elm_atspi_role_get)
45 win = elm_win_add(NULL, "image", ELM_WIN_BASIC); 45 win = elm_win_add(NULL, "image", ELM_WIN_BASIC);
46 46
47 image = elm_image_add(win); 47 image = elm_image_add(win);
48 role = efl_access_role_get(image); 48 role = efl_access_object_role_get(image);
49 49
50 ck_assert(role == EFL_ACCESS_ROLE_IMAGE); 50 ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
51 51
diff --git a/src/tests/elementary/elm_test_index.c b/src/tests/elementary/elm_test_index.c
index e8ea3ecff1..75d365ead7 100644
--- a/src/tests/elementary/elm_test_index.c
+++ b/src/tests/elementary/elm_test_index.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "index", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "index", ELM_WIN_BASIC);
35 35
36 idx = elm_index_add(win); 36 idx = elm_index_add(win);
37 role = efl_access_role_get(idx); 37 role = efl_access_object_role_get(idx);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_SCROLL_BAR); 39 ck_assert(role == EFL_ACCESS_ROLE_SCROLL_BAR);
40 40
diff --git a/src/tests/elementary/elm_test_inwin.c b/src/tests/elementary/elm_test_inwin.c
index 33141b4f6a..c330a63cf4 100644
--- a/src/tests/elementary/elm_test_inwin.c
+++ b/src/tests/elementary/elm_test_inwin.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
35 35
36 inwin = elm_win_inwin_add(win); 36 inwin = elm_win_inwin_add(win);
37 role = efl_access_role_get(inwin); 37 role = efl_access_object_role_get(inwin);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_GLASS_PANE); 39 ck_assert(role == EFL_ACCESS_ROLE_GLASS_PANE);
40 40
diff --git a/src/tests/elementary/elm_test_label.c b/src/tests/elementary/elm_test_label.c
index e580ec4c4c..a79ae73711 100644
--- a/src/tests/elementary/elm_test_label.c
+++ b/src/tests/elementary/elm_test_label.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "label", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "label", ELM_WIN_BASIC);
35 35
36 label = elm_label_add(win); 36 label = elm_label_add(win);
37 role = efl_access_role_get(label); 37 role = efl_access_object_role_get(label);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_LABEL); 39 ck_assert(role == EFL_ACCESS_ROLE_LABEL);
40 40
diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c
index cf7badeb91..a62e2c79e2 100644
--- a/src/tests/elementary/elm_test_layout.c
+++ b/src/tests/elementary/elm_test_layout.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST(elm_atspi_role_get)
34 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
35 35
36 layout = elm_layout_add(win); 36 layout = elm_layout_add(win);
37 role = efl_access_role_get(layout); 37 role = efl_access_object_role_get(layout);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_FILLER); 39 ck_assert(role == EFL_ACCESS_ROLE_FILLER);
40 40
diff --git a/src/tests/elementary/elm_test_list.c b/src/tests/elementary/elm_test_list.c
index e5e27e6888..67a4663f80 100644
--- a/src/tests/elementary/elm_test_list.c
+++ b/src/tests/elementary/elm_test_list.c
@@ -3,8 +3,8 @@
3#endif 3#endif
4 4
5#define EFL_ACCESS_SELECTION_PROTECTED 5#define EFL_ACCESS_SELECTION_PROTECTED
6#define EFL_ACCESS_BETA 6#define EFL_ACCESS_OBJECT_BETA
7#define EFL_ACCESS_PROTECTED 7#define EFL_ACCESS_OBJECT_PROTECTED
8#include <Elementary.h> 8#include <Elementary.h>
9#include "elm_suite.h" 9#include "elm_suite.h"
10 10
@@ -206,7 +206,7 @@ EFL_START_TEST (elm_atspi_role_get)
206 win = elm_win_add(NULL, "list", ELM_WIN_BASIC); 206 win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
207 207
208 list = elm_list_add(win); 208 list = elm_list_add(win);
209 role = efl_access_role_get(list); 209 role = efl_access_object_role_get(list);
210 210
211 ck_assert(role == EFL_ACCESS_ROLE_LIST); 211 ck_assert(role == EFL_ACCESS_ROLE_LIST);
212 212
@@ -220,7 +220,7 @@ EFL_END_TEST
220 */ 220 */
221EFL_START_TEST(elm_atspi_children_parent) 221EFL_START_TEST(elm_atspi_children_parent)
222{ 222{
223 Efl_Access *parent; 223 Efl_Access_Object *parent;
224 Elm_Object_Item *it; 224 Elm_Object_Item *it;
225 225
226 Evas_Object *win = elm_win_add(NULL, "list", ELM_WIN_BASIC); 226 Evas_Object *win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
@@ -233,10 +233,10 @@ EFL_START_TEST(elm_atspi_children_parent)
233 233
234 evas_object_show(list); 234 evas_object_show(list);
235 235
236 parent = efl_provider_find(efl_parent_get(icon), EFL_ACCESS_MIXIN); 236 parent = efl_provider_find(efl_parent_get(icon), EFL_ACCESS_OBJECT_MIXIN);
237 ck_assert(it == parent); 237 ck_assert(it == parent);
238 238
239 parent = efl_provider_find(efl_parent_get(end), EFL_ACCESS_MIXIN); 239 parent = efl_provider_find(efl_parent_get(end), EFL_ACCESS_OBJECT_MIXIN);
240 ck_assert(it == parent); 240 ck_assert(it == parent);
241 241
242} 242}
diff --git a/src/tests/elementary/elm_test_map.c b/src/tests/elementary/elm_test_map.c
index b127027057..5e5b07c7b0 100644
--- a/src/tests/elementary/elm_test_map.c
+++ b/src/tests/elementary/elm_test_map.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "map", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "map", ELM_WIN_BASIC);
35 35
36 map = elm_map_add(win); 36 map = elm_map_add(win);
37 role = efl_access_role_get(map); 37 role = efl_access_object_role_get(map);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_IMAGE_MAP); 39 ck_assert(role == EFL_ACCESS_ROLE_IMAGE_MAP);
40 40
diff --git a/src/tests/elementary/elm_test_mapbuf.c b/src/tests/elementary/elm_test_mapbuf.c
index 7f86c901be..bf4c1e6a7b 100644
--- a/src/tests/elementary/elm_test_mapbuf.c
+++ b/src/tests/elementary/elm_test_mapbuf.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC);
35 35
36 mapbuf = elm_mapbuf_add(win); 36 mapbuf = elm_mapbuf_add(win);
37 role = efl_access_role_get(mapbuf); 37 role = efl_access_object_role_get(mapbuf);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_IMAGE_MAP); 39 ck_assert(role == EFL_ACCESS_ROLE_IMAGE_MAP);
40 40
diff --git a/src/tests/elementary/elm_test_menu.c b/src/tests/elementary/elm_test_menu.c
index 3477a6044b..16ce607aec 100644
--- a/src/tests/elementary/elm_test_menu.c
+++ b/src/tests/elementary/elm_test_menu.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "menu", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "menu", ELM_WIN_BASIC);
35 35
36 menu = elm_menu_add(win); 36 menu = elm_menu_add(win);
37 role = efl_access_role_get(menu); 37 role = efl_access_object_role_get(menu);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_MENU); 39 ck_assert(role == EFL_ACCESS_ROLE_MENU);
40 40
diff --git a/src/tests/elementary/elm_test_multibuttonentry.c b/src/tests/elementary/elm_test_multibuttonentry.c
index 8d988a5fc5..501a79eeeb 100644
--- a/src/tests/elementary/elm_test_multibuttonentry.c
+++ b/src/tests/elementary/elm_test_multibuttonentry.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "multibuttonentry", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "multibuttonentry", ELM_WIN_BASIC);
35 35
36 multibuttonentry = elm_multibuttonentry_add(win); 36 multibuttonentry = elm_multibuttonentry_add(win);
37 role = efl_access_role_get(multibuttonentry); 37 role = efl_access_object_role_get(multibuttonentry);
38 38
39 ck_assert_int_eq(role, EFL_ACCESS_ROLE_PANEL); 39 ck_assert_int_eq(role, EFL_ACCESS_ROLE_PANEL);
40 40
diff --git a/src/tests/elementary/elm_test_naviframe.c b/src/tests/elementary/elm_test_naviframe.c
index fcabc194e0..4e34ba5819 100644
--- a/src/tests/elementary/elm_test_naviframe.c
+++ b/src/tests/elementary/elm_test_naviframe.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC);
35 35
36 naviframe = elm_naviframe_add(win); 36 naviframe = elm_naviframe_add(win);
37 role = efl_access_role_get(naviframe); 37 role = efl_access_object_role_get(naviframe);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_PAGE_TAB_LIST); 39 ck_assert(role == EFL_ACCESS_ROLE_PAGE_TAB_LIST);
40 40
diff --git a/src/tests/elementary/elm_test_notify.c b/src/tests/elementary/elm_test_notify.c
index 41156306ab..a7e890ab9f 100644
--- a/src/tests/elementary/elm_test_notify.c
+++ b/src/tests/elementary/elm_test_notify.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "notify", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "notify", ELM_WIN_BASIC);
35 35
36 notify = elm_notify_add(win); 36 notify = elm_notify_add(win);
37 role = efl_access_role_get(notify); 37 role = efl_access_object_role_get(notify);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_NOTIFICATION); 39 ck_assert(role == EFL_ACCESS_ROLE_NOTIFICATION);
40 40
diff --git a/src/tests/elementary/elm_test_panel.c b/src/tests/elementary/elm_test_panel.c
index 8a52b75bf0..e10995f4b4 100644
--- a/src/tests/elementary/elm_test_panel.c
+++ b/src/tests/elementary/elm_test_panel.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "panel", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "panel", ELM_WIN_BASIC);
35 35
36 panel = elm_panel_add(win); 36 panel = elm_panel_add(win);
37 role = efl_access_role_get(panel); 37 role = efl_access_object_role_get(panel);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_PANEL); 39 ck_assert(role == EFL_ACCESS_ROLE_PANEL);
40 40
diff --git a/src/tests/elementary/elm_test_panes.c b/src/tests/elementary/elm_test_panes.c
index f6796ee81c..f084ee67e4 100644
--- a/src/tests/elementary/elm_test_panes.c
+++ b/src/tests/elementary/elm_test_panes.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "panes", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "panes", ELM_WIN_BASIC);
35 35
36 panes = elm_panes_add(win); 36 panes = elm_panes_add(win);
37 role = efl_access_role_get(panes); 37 role = efl_access_object_role_get(panes);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_SPLIT_PANE); 39 ck_assert(role == EFL_ACCESS_ROLE_SPLIT_PANE);
40 40
diff --git a/src/tests/elementary/elm_test_photo.c b/src/tests/elementary/elm_test_photo.c
index 454affc283..29ddcdba2b 100644
--- a/src/tests/elementary/elm_test_photo.c
+++ b/src/tests/elementary/elm_test_photo.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "photo", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "photo", ELM_WIN_BASIC);
35 35
36 photo = elm_photo_add(win); 36 photo = elm_photo_add(win);
37 role = efl_access_role_get(photo); 37 role = efl_access_object_role_get(photo);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_IMAGE); 39 ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
40 40
diff --git a/src/tests/elementary/elm_test_photocam.c b/src/tests/elementary/elm_test_photocam.c
index 3de90e75d3..d374cbd983 100644
--- a/src/tests/elementary/elm_test_photocam.c
+++ b/src/tests/elementary/elm_test_photocam.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC);
35 35
36 photocam = elm_photocam_add(win); 36 photocam = elm_photocam_add(win);
37 role = efl_access_role_get(photocam); 37 role = efl_access_object_role_get(photocam);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_IMAGE); 39 ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
40 40
diff --git a/src/tests/elementary/elm_test_player.c b/src/tests/elementary/elm_test_player.c
index 332895c445..c300a27284 100644
--- a/src/tests/elementary/elm_test_player.c
+++ b/src/tests/elementary/elm_test_player.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "player", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "player", ELM_WIN_BASIC);
35 35
36 player = elm_player_add(win); 36 player = elm_player_add(win);
37 role = efl_access_role_get(player); 37 role = efl_access_object_role_get(player);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_ANIMATION); 39 ck_assert(role == EFL_ACCESS_ROLE_ANIMATION);
40 40
diff --git a/src/tests/elementary/elm_test_plug.c b/src/tests/elementary/elm_test_plug.c
index 3912df07b6..dff2d69684 100644
--- a/src/tests/elementary/elm_test_plug.c
+++ b/src/tests/elementary/elm_test_plug.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "plug", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "plug", ELM_WIN_BASIC);
35 35
36 plug = elm_plug_add(win); 36 plug = elm_plug_add(win);
37 role = efl_access_role_get(plug); 37 role = efl_access_object_role_get(plug);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_IMAGE); 39 ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
40 40
diff --git a/src/tests/elementary/elm_test_popup.c b/src/tests/elementary/elm_test_popup.c
index 3283499758..99c07c63f1 100644
--- a/src/tests/elementary/elm_test_popup.c
+++ b/src/tests/elementary/elm_test_popup.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "popup", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "popup", ELM_WIN_BASIC);
35 35
36 popup = elm_popup_add(win); 36 popup = elm_popup_add(win);
37 role = efl_access_role_get(popup); 37 role = efl_access_object_role_get(popup);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_DIALOG); 39 ck_assert(role == EFL_ACCESS_ROLE_DIALOG);
40 40
diff --git a/src/tests/elementary/elm_test_prefs.c b/src/tests/elementary/elm_test_prefs.c
index 5efca7b9b1..a881512cf9 100644
--- a/src/tests/elementary/elm_test_prefs.c
+++ b/src/tests/elementary/elm_test_prefs.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -38,7 +38,7 @@ EFL_START_TEST (elm_atspi_role_get)
38 win = elm_win_add(NULL, "prefs", ELM_WIN_BASIC); 38 win = elm_win_add(NULL, "prefs", ELM_WIN_BASIC);
39 39
40 prefs = elm_prefs_add(win); 40 prefs = elm_prefs_add(win);
41 role = efl_access_role_get(prefs); 41 role = efl_access_object_role_get(prefs);
42 42
43 ck_assert(role == EFL_ACCESS_ROLE_REDUNDANT_OBJECT); 43 ck_assert(role == EFL_ACCESS_ROLE_REDUNDANT_OBJECT);
44 44
diff --git a/src/tests/elementary/elm_test_progressbar.c b/src/tests/elementary/elm_test_progressbar.c
index ad3fbec976..e561bb3575 100644
--- a/src/tests/elementary/elm_test_progressbar.c
+++ b/src/tests/elementary/elm_test_progressbar.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC);
35 35
36 progressbar = elm_progressbar_add(win); 36 progressbar = elm_progressbar_add(win);
37 role = efl_access_role_get(progressbar); 37 role = efl_access_object_role_get(progressbar);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_PROGRESS_BAR); 39 ck_assert(role == EFL_ACCESS_ROLE_PROGRESS_BAR);
40 40
diff --git a/src/tests/elementary/elm_test_radio.c b/src/tests/elementary/elm_test_radio.c
index 954c3d8e18..13de95d6bf 100644
--- a/src/tests/elementary/elm_test_radio.c
+++ b/src/tests/elementary/elm_test_radio.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "radio", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "radio", ELM_WIN_BASIC);
35 35
36 radio = elm_radio_add(win); 36 radio = elm_radio_add(win);
37 role = efl_access_role_get(radio); 37 role = efl_access_object_role_get(radio);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_RADIO_BUTTON); 39 ck_assert(role == EFL_ACCESS_ROLE_RADIO_BUTTON);
40 40
diff --git a/src/tests/elementary/elm_test_scroller.c b/src/tests/elementary/elm_test_scroller.c
index a21949dbcd..00df0038fb 100644
--- a/src/tests/elementary/elm_test_scroller.c
+++ b/src/tests/elementary/elm_test_scroller.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC);
35 35
36 scroller = elm_scroller_add(win); 36 scroller = elm_scroller_add(win);
37 role = efl_access_role_get(scroller); 37 role = efl_access_object_role_get(scroller);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_SCROLL_PANE); 39 ck_assert(role == EFL_ACCESS_ROLE_SCROLL_PANE);
40 40
diff --git a/src/tests/elementary/elm_test_segmentcontrol.c b/src/tests/elementary/elm_test_segmentcontrol.c
index baca5d3704..fa57c060c3 100644
--- a/src/tests/elementary/elm_test_segmentcontrol.c
+++ b/src/tests/elementary/elm_test_segmentcontrol.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "segmentcontrol", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "segmentcontrol", ELM_WIN_BASIC);
35 35
36 segmentcontrol = elm_segment_control_add(win); 36 segmentcontrol = elm_segment_control_add(win);
37 role = efl_access_role_get(segmentcontrol); 37 role = efl_access_object_role_get(segmentcontrol);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_LIST); 39 ck_assert(role == EFL_ACCESS_ROLE_LIST);
40 40
diff --git a/src/tests/elementary/elm_test_separator.c b/src/tests/elementary/elm_test_separator.c
index 3e85e42b33..a9863859ea 100644
--- a/src/tests/elementary/elm_test_separator.c
+++ b/src/tests/elementary/elm_test_separator.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
35 35
36 separator = elm_separator_add(win); 36 separator = elm_separator_add(win);
37 role = efl_access_role_get(separator); 37 role = efl_access_object_role_get(separator);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_SEPARATOR); 39 ck_assert(role == EFL_ACCESS_ROLE_SEPARATOR);
40 40
diff --git a/src/tests/elementary/elm_test_slider.c b/src/tests/elementary/elm_test_slider.c
index 1cff728e87..b3445a01ca 100644
--- a/src/tests/elementary/elm_test_slider.c
+++ b/src/tests/elementary/elm_test_slider.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "slider", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "slider", ELM_WIN_BASIC);
35 35
36 slider = elm_slider_add(win); 36 slider = elm_slider_add(win);
37 role = efl_access_role_get(slider); 37 role = efl_access_object_role_get(slider);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_SLIDER); 39 ck_assert(role == EFL_ACCESS_ROLE_SLIDER);
40 40
diff --git a/src/tests/elementary/elm_test_slideshow.c b/src/tests/elementary/elm_test_slideshow.c
index fd618ec44b..31e4edc8bc 100644
--- a/src/tests/elementary/elm_test_slideshow.c
+++ b/src/tests/elementary/elm_test_slideshow.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC);
35 35
36 slideshow = elm_slideshow_add(win); 36 slideshow = elm_slideshow_add(win);
37 role = efl_access_role_get(slideshow); 37 role = efl_access_object_role_get(slideshow);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_DOCUMENT_PRESENTATION); 39 ck_assert(role == EFL_ACCESS_ROLE_DOCUMENT_PRESENTATION);
40 40
diff --git a/src/tests/elementary/elm_test_spinner.c b/src/tests/elementary/elm_test_spinner.c
index fc3bd4edcc..c954ef5b26 100644
--- a/src/tests/elementary/elm_test_spinner.c
+++ b/src/tests/elementary/elm_test_spinner.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC);
35 35
36 spinner = elm_spinner_add(win); 36 spinner = elm_spinner_add(win);
37 role = efl_access_role_get(spinner); 37 role = efl_access_object_role_get(spinner);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_SPIN_BUTTON); 39 ck_assert(role == EFL_ACCESS_ROLE_SPIN_BUTTON);
40 40
diff --git a/src/tests/elementary/elm_test_table.c b/src/tests/elementary/elm_test_table.c
index 57b8b383df..6fb1c7092f 100644
--- a/src/tests/elementary/elm_test_table.c
+++ b/src/tests/elementary/elm_test_table.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "table", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "table", ELM_WIN_BASIC);
35 35
36 table = elm_table_add(win); 36 table = elm_table_add(win);
37 role = efl_access_role_get(table); 37 role = efl_access_object_role_get(table);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_FILLER); 39 ck_assert(role == EFL_ACCESS_ROLE_FILLER);
40 40
diff --git a/src/tests/elementary/elm_test_thumb.c b/src/tests/elementary/elm_test_thumb.c
index 9b82f750a2..a4983b8175 100644
--- a/src/tests/elementary/elm_test_thumb.c
+++ b/src/tests/elementary/elm_test_thumb.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -35,7 +35,7 @@ EFL_START_TEST (elm_atspi_role_get)
35 win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC); 35 win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC);
36 36
37 thumb = elm_thumb_add(win); 37 thumb = elm_thumb_add(win);
38 role = efl_access_role_get(thumb); 38 role = efl_access_object_role_get(thumb);
39 39
40 ck_assert(role == EFL_ACCESS_ROLE_IMAGE); 40 ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
41 41
diff --git a/src/tests/elementary/elm_test_toolbar.c b/src/tests/elementary/elm_test_toolbar.c
index e4d759c524..39221277b2 100644
--- a/src/tests/elementary/elm_test_toolbar.c
+++ b/src/tests/elementary/elm_test_toolbar.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
35 35
36 toolbar = elm_toolbar_add(win); 36 toolbar = elm_toolbar_add(win);
37 role = efl_access_role_get(toolbar); 37 role = efl_access_object_role_get(toolbar);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_TOOL_BAR); 39 ck_assert(role == EFL_ACCESS_ROLE_TOOL_BAR);
40 40
diff --git a/src/tests/elementary/elm_test_video.c b/src/tests/elementary/elm_test_video.c
index 9e8d709d7f..e643475632 100644
--- a/src/tests/elementary/elm_test_video.c
+++ b/src/tests/elementary/elm_test_video.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "video", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "video", ELM_WIN_BASIC);
35 35
36 video = elm_video_add(win); 36 video = elm_video_add(win);
37 role = efl_access_role_get(video); 37 role = efl_access_object_role_get(video);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_ANIMATION); 39 ck_assert(role == EFL_ACCESS_ROLE_ANIMATION);
40 40
diff --git a/src/tests/elementary/elm_test_web.c b/src/tests/elementary/elm_test_web.c
index 2ae4a2517b..28607fac5b 100644
--- a/src/tests/elementary/elm_test_web.c
+++ b/src/tests/elementary/elm_test_web.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 win = elm_win_add(NULL, "web", ELM_WIN_BASIC); 34 win = elm_win_add(NULL, "web", ELM_WIN_BASIC);
35 35
36 web = elm_web_add(win); 36 web = elm_web_add(win);
37 role = efl_access_role_get(web); 37 role = efl_access_object_role_get(web);
38 38
39 ck_assert(role == EFL_ACCESS_ROLE_HTML_CONTAINER); 39 ck_assert(role == EFL_ACCESS_ROLE_HTML_CONTAINER);
40 40
diff --git a/src/tests/elementary/elm_test_win.c b/src/tests/elementary/elm_test_win.c
index c7ef94a74e..311b16bc64 100644
--- a/src/tests/elementary/elm_test_win.c
+++ b/src/tests/elementary/elm_test_win.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define EFL_ACCESS_BETA 5#define EFL_ACCESS_OBJECT_BETA
6#define EFL_ACCESS_COMPONENT_BETA 6#define EFL_ACCESS_COMPONENT_BETA
7#define EFL_ACCESS_COMPONENT_PROTECTED 7#define EFL_ACCESS_COMPONENT_PROTECTED
8#define EFL_CANVAS_SCENE_BETA 8#define EFL_CANVAS_SCENE_BETA
@@ -88,7 +88,7 @@ EFL_START_TEST (elm_atspi_role_get)
88 88
89 win = elm_win_add(NULL, "win", ELM_WIN_BASIC); 89 win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
90 90
91 role = efl_access_role_get(win); 91 role = efl_access_object_role_get(win);
92 92
93 ck_assert(role == EFL_ACCESS_ROLE_WINDOW); 93 ck_assert(role == EFL_ACCESS_ROLE_WINDOW);
94 94