summaryrefslogtreecommitdiff
path: root/src/tests/elementary
diff options
context:
space:
mode:
authorLukasz Stanislawski <lukasz.stanislawski@gmail.com>2017-10-19 10:13:54 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-10-19 10:13:54 +0900
commit57aefc53c18c14ada19dcd09d3e5b5612b277b16 (patch)
tree897745eb7c2d9ccbbde1bc0cf4dd2971c2e625f4 /src/tests/elementary
parent98622623a0865c525ede12ef5759ab6f5b3af407 (diff)
elm: rename Elm_Interface_Atspi_Accessible interface
Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5341
Diffstat (limited to 'src/tests/elementary')
-rw-r--r--src/tests/elementary/elm_test_actionslider.c8
-rw-r--r--src/tests/elementary/elm_test_atspi.c234
-rw-r--r--src/tests/elementary/elm_test_box.c8
-rw-r--r--src/tests/elementary/elm_test_bubble.c8
-rw-r--r--src/tests/elementary/elm_test_button.c10
-rw-r--r--src/tests/elementary/elm_test_calendar.c8
-rw-r--r--src/tests/elementary/elm_test_check.c8
-rw-r--r--src/tests/elementary/elm_test_clock.c8
-rw-r--r--src/tests/elementary/elm_test_colorselector.c8
-rw-r--r--src/tests/elementary/elm_test_config.c2
-rw-r--r--src/tests/elementary/elm_test_conformant.c8
-rw-r--r--src/tests/elementary/elm_test_ctxpopup.c8
-rw-r--r--src/tests/elementary/elm_test_datetime.c8
-rw-r--r--src/tests/elementary/elm_test_dayselector.c8
-rw-r--r--src/tests/elementary/elm_test_diskselector.c8
-rw-r--r--src/tests/elementary/elm_test_entry.c8
-rw-r--r--src/tests/elementary/elm_test_fileselector.c8
-rw-r--r--src/tests/elementary/elm_test_fileselector_button.c8
-rw-r--r--src/tests/elementary/elm_test_fileselector_entry.c8
-rw-r--r--src/tests/elementary/elm_test_flip.c8
-rw-r--r--src/tests/elementary/elm_test_flipselector.c8
-rw-r--r--src/tests/elementary/elm_test_focus_common.h2
-rw-r--r--src/tests/elementary/elm_test_frame.c8
-rw-r--r--src/tests/elementary/elm_test_gengrid.c12
-rw-r--r--src/tests/elementary/elm_test_genlist.c26
-rw-r--r--src/tests/elementary/elm_test_glview.c8
-rw-r--r--src/tests/elementary/elm_test_grid.c8
-rw-r--r--src/tests/elementary/elm_test_hover.c8
-rw-r--r--src/tests/elementary/elm_test_hoversel.c8
-rw-r--r--src/tests/elementary/elm_test_icon.c8
-rw-r--r--src/tests/elementary/elm_test_image.c8
-rw-r--r--src/tests/elementary/elm_test_index.c8
-rw-r--r--src/tests/elementary/elm_test_inwin.c8
-rw-r--r--src/tests/elementary/elm_test_label.c8
-rw-r--r--src/tests/elementary/elm_test_layout.c8
-rw-r--r--src/tests/elementary/elm_test_list.c14
-rw-r--r--src/tests/elementary/elm_test_map.c8
-rw-r--r--src/tests/elementary/elm_test_mapbuf.c8
-rw-r--r--src/tests/elementary/elm_test_menu.c8
-rw-r--r--src/tests/elementary/elm_test_multibuttonentry.c8
-rw-r--r--src/tests/elementary/elm_test_naviframe.c8
-rw-r--r--src/tests/elementary/elm_test_notify.c8
-rw-r--r--src/tests/elementary/elm_test_panel.c8
-rw-r--r--src/tests/elementary/elm_test_panes.c8
-rw-r--r--src/tests/elementary/elm_test_photo.c8
-rw-r--r--src/tests/elementary/elm_test_photocam.c8
-rw-r--r--src/tests/elementary/elm_test_player.c8
-rw-r--r--src/tests/elementary/elm_test_plug.c8
-rw-r--r--src/tests/elementary/elm_test_popup.c8
-rw-r--r--src/tests/elementary/elm_test_prefs.c8
-rw-r--r--src/tests/elementary/elm_test_progressbar.c8
-rw-r--r--src/tests/elementary/elm_test_radio.c8
-rw-r--r--src/tests/elementary/elm_test_scroller.c8
-rw-r--r--src/tests/elementary/elm_test_segmentcontrol.c8
-rw-r--r--src/tests/elementary/elm_test_separator.c8
-rw-r--r--src/tests/elementary/elm_test_slider.c8
-rw-r--r--src/tests/elementary/elm_test_slideshow.c8
-rw-r--r--src/tests/elementary/elm_test_spinner.c8
-rw-r--r--src/tests/elementary/elm_test_table.c8
-rw-r--r--src/tests/elementary/elm_test_thumb.c8
-rw-r--r--src/tests/elementary/elm_test_toolbar.c8
-rw-r--r--src/tests/elementary/elm_test_video.c8
-rw-r--r--src/tests/elementary/elm_test_web.c8
-rw-r--r--src/tests/elementary/elm_test_win.c8
64 files changed, 377 insertions, 379 deletions
diff --git a/src/tests/elementary/elm_test_actionslider.c b/src/tests/elementary/elm_test_actionslider.c
index a6d7137..ef5f849 100644
--- a/src/tests/elementary/elm_test_actionslider.c
+++ b/src/tests/elementary/elm_test_actionslider.c
@@ -2,22 +2,22 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
9START_TEST (elm_atspi_role_get) 9START_TEST (elm_atspi_role_get)
10{ 10{
11 Evas_Object *win, *actionslider; 11 Evas_Object *win, *actionslider;
12 Elm_Atspi_Role role; 12 Efl_Access_Role role;
13 13
14 elm_init(1, NULL); 14 elm_init(1, NULL);
15 win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC); 15 win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC);
16 16
17 actionslider = elm_actionslider_add(win); 17 actionslider = elm_actionslider_add(win);
18 role = elm_interface_atspi_accessible_role_get(actionslider); 18 role = efl_access_role_get(actionslider);
19 19
20 ck_assert(role == ELM_ATSPI_ROLE_SLIDER); 20 ck_assert(role == EFL_ACCESS_ROLE_SLIDER);
21 21
22 elm_shutdown(); 22 elm_shutdown();
23} 23}
diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c
index 8f9e043..1875fb2 100644
--- a/src/tests/elementary/elm_test_atspi.c
+++ b/src/tests/elementary/elm_test_atspi.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4 4
5#define ELM_INTERNAL_API_ARGESFSDFEFC 5#define ELM_INTERNAL_API_ARGESFSDFEFC
6#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 6#define EFL_ACCESS_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
9#include "elm_priv.h" 9#include "elm_priv.h"
@@ -25,7 +25,7 @@ void generate_app(void)
25 evas_object_show(g_win); 25 evas_object_show(g_win);
26} 26}
27 27
28START_TEST (elm_atspi_app_obj_name_get) 28START_TEST (test_efl_access_app_obj_name_get)
29{ 29{
30 elm_init(0, NULL); 30 elm_init(0, NULL);
31 31
@@ -37,7 +37,7 @@ START_TEST (elm_atspi_app_obj_name_get)
37 37
38 elm_app_name_set("Test name"); 38 elm_app_name_set("Test name");
39 39
40 ret = elm_interface_atspi_accessible_name_get(root); 40 ret = efl_access_name_get(root);
41 41
42 ck_assert_str_eq(ret, "Test name"); 42 ck_assert_str_eq(ret, "Test name");
43 43
@@ -46,14 +46,14 @@ START_TEST (elm_atspi_app_obj_name_get)
46} 46}
47END_TEST 47END_TEST
48 48
49START_TEST (elm_atspi_name_get) 49START_TEST (test_efl_access_name_get)
50{ 50{
51 elm_init(0, NULL); 51 elm_init(0, NULL);
52 generate_app(); 52 generate_app();
53 53
54 const char *name; 54 const char *name;
55 55
56 name = elm_interface_atspi_accessible_name_get(g_btn); 56 name = efl_access_name_get(g_btn);
57 57
58 if (name && name[0]) { 58 if (name && name[0]) {
59 ck_assert(0); 59 ck_assert(0);
@@ -62,7 +62,7 @@ START_TEST (elm_atspi_name_get)
62 // Set name with additional text tags 62 // Set name with additional text tags
63 elm_object_text_set(g_btn, "Some<br>text"); 63 elm_object_text_set(g_btn, "Some<br>text");
64 64
65 name = elm_interface_atspi_accessible_name_get(g_btn); 65 name = efl_access_name_get(g_btn);
66 66
67 // Accessible name should have cleared tags 67 // Accessible name should have cleared tags
68 ck_assert(name != NULL); 68 ck_assert(name != NULL);
@@ -72,7 +72,7 @@ START_TEST (elm_atspi_name_get)
72} 72}
73END_TEST 73END_TEST
74 74
75START_TEST (elm_atspi_name_set) 75START_TEST (test_efl_access_name_set)
76{ 76{
77 elm_init(0, NULL); 77 elm_init(0, NULL);
78 generate_app(); 78 generate_app();
@@ -80,15 +80,15 @@ START_TEST (elm_atspi_name_set)
80 const char *name; 80 const char *name;
81 81
82 elm_object_text_set(g_btn, "Other text"); 82 elm_object_text_set(g_btn, "Other text");
83 elm_interface_atspi_accessible_name_set(g_btn, "Test name"); 83 efl_access_name_set(g_btn, "Test name");
84 84
85 name = elm_interface_atspi_accessible_name_get(g_btn); 85 name = efl_access_name_get(g_btn);
86 86
87 ck_assert(name != NULL); 87 ck_assert(name != NULL);
88 ck_assert_str_eq(name, "Test name"); 88 ck_assert_str_eq(name, "Test name");
89 89
90 elm_interface_atspi_accessible_name_set(g_btn, NULL); 90 efl_access_name_set(g_btn, NULL);
91 name = elm_interface_atspi_accessible_name_get(g_btn); 91 name = efl_access_name_get(g_btn);
92 92
93 ck_assert(name != NULL); 93 ck_assert(name != NULL);
94 ck_assert_str_eq(name, "Other text"); 94 ck_assert_str_eq(name, "Other text");
@@ -97,48 +97,46 @@ START_TEST (elm_atspi_name_set)
97} 97}
98END_TEST 98END_TEST
99 99
100START_TEST (elm_atspi_role_get) 100START_TEST (test_efl_access_role_get)
101{ 101{
102 elm_init(0, NULL); 102 elm_init(0, NULL);
103 103
104 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL); 104 Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
105 105
106 Elm_Atspi_Role role; 106 Efl_Access_Role role;
107 107
108 role = elm_interface_atspi_accessible_role_get(root); 108 role = efl_access_role_get(root);
109 109
110 ck_assert(role == ELM_ATSPI_ROLE_APPLICATION); 110 ck_assert(role == EFL_ACCESS_ROLE_APPLICATION);
111 111
112 efl_unref(root); 112 efl_unref(root);
113 elm_shutdown(); 113 elm_shutdown();
114} 114}
115END_TEST 115END_TEST
116 116
117START_TEST (elm_atspi_role_set) 117START_TEST (test_efl_access_role_set)
118{ 118{
119 elm_init(0, NULL); 119 elm_init(0, NULL);
120 generate_app(); 120 generate_app();
121 Elm_Atspi_Role role; 121 Efl_Access_Role role;
122 122
123 elm_interface_atspi_accessible_role_set(g_btn, ELM_ATSPI_ROLE_ACCELERATOR_LABEL); 123 efl_access_role_set(g_btn, EFL_ACCESS_ROLE_ACCELERATOR_LABEL);
124 role = elm_interface_atspi_accessible_role_get(g_btn); 124 role = efl_access_role_get(g_btn);
125 125
126 if (role != ELM_ATSPI_ROLE_ACCELERATOR_LABEL) 126 if (role != EFL_ACCESS_ROLE_ACCELERATOR_LABEL)
127 ck_assert(0); 127 ck_assert(0);
128 128
129 elm_interface_atspi_accessible_role_set(g_btn, ELM_ATSPI_ROLE_ENTRY); 129 efl_access_role_set(g_btn, EFL_ACCESS_ROLE_ENTRY);
130 role = elm_interface_atspi_accessible_role_get(g_btn); 130 role = efl_access_role_get(g_btn);
131 131
132 if (role != ELM_ATSPI_ROLE_ENTRY) 132 if (role != EFL_ACCESS_ROLE_ENTRY)
133 ck_assert(0); 133 ck_assert(0);
134 134
135 elm_shutdown(); 135 elm_shutdown();
136} 136}
137END_TEST 137END_TEST
138 138
139 139START_TEST (test_efl_access_role_name_get)
140
141START_TEST (elm_atspi_role_name_get)
142{ 140{
143 elm_init(0, NULL); 141 elm_init(0, NULL);
144 142
@@ -146,7 +144,7 @@ START_TEST (elm_atspi_role_name_get)
146 144
147 const char *ret = NULL; 145 const char *ret = NULL;
148 146
149 ret = elm_interface_atspi_accessible_role_name_get(root); 147 ret = efl_access_role_name_get(root);
150 148
151 ck_assert(ret != NULL); 149 ck_assert(ret != NULL);
152 150
@@ -155,7 +153,7 @@ START_TEST (elm_atspi_role_name_get)
155} 153}
156END_TEST 154END_TEST
157 155
158START_TEST (elm_atspi_localized_role_name_get) 156START_TEST (test_efl_access_localized_role_name_get)
159{ 157{
160 elm_init(0, NULL); 158 elm_init(0, NULL);
161 159
@@ -163,7 +161,7 @@ START_TEST (elm_atspi_localized_role_name_get)
163 161
164 const char *ret = NULL; 162 const char *ret = NULL;
165 163
166 ret = elm_interface_atspi_accessible_localized_role_name_get(root); 164 ret = efl_access_localized_role_name_get(root);
167 165
168 ck_assert(ret != NULL); 166 ck_assert(ret != NULL);
169 167
@@ -172,7 +170,7 @@ START_TEST (elm_atspi_localized_role_name_get)
172} 170}
173END_TEST 171END_TEST
174 172
175START_TEST (elm_atspi_description_set) 173START_TEST (test_efl_access_description_set)
176{ 174{
177 elm_init(0, NULL); 175 elm_init(0, NULL);
178 176
@@ -182,18 +180,18 @@ START_TEST (elm_atspi_description_set)
182 180
183 const char *desc = "Test description"; 181 const char *desc = "Test description";
184 182
185 ret = elm_interface_atspi_accessible_description_get(root); 183 ret = efl_access_description_get(root);
186 184
187 ck_assert(ret == NULL); 185 ck_assert(ret == NULL);
188 186
189 elm_interface_atspi_accessible_description_set(root, desc); 187 efl_access_description_set(root, desc);
190 ret = elm_interface_atspi_accessible_description_get(root); 188 ret = efl_access_description_get(root);
191 189
192 ck_assert(ret != NULL); 190 ck_assert(ret != NULL);
193 ck_assert_str_eq(ret, "Test description"); 191 ck_assert_str_eq(ret, "Test description");
194 192
195 elm_interface_atspi_accessible_description_set(root, NULL); 193 efl_access_description_set(root, NULL);
196 ret = elm_interface_atspi_accessible_description_get(root); 194 ret = efl_access_description_get(root);
197 195
198 ck_assert(ret == NULL); 196 ck_assert(ret == NULL);
199 197
@@ -203,13 +201,13 @@ START_TEST (elm_atspi_description_set)
203END_TEST 201END_TEST
204 202
205/* Test if initial description value is NULL */ 203/* Test if initial description value is NULL */
206START_TEST (elm_atspi_description_get) 204START_TEST (test_efl_access_description_get)
207{ 205{
208 elm_init(0, NULL); 206 elm_init(0, NULL);
209 generate_app(); 207 generate_app();
210 208
211 const char *descr; 209 const char *descr;
212 descr = elm_interface_atspi_accessible_description_get(g_bg); 210 descr = efl_access_description_get(g_bg);
213 211
214 ck_assert(descr == NULL); 212 ck_assert(descr == NULL);
215 213
@@ -217,7 +215,7 @@ START_TEST (elm_atspi_description_get)
217} 215}
218END_TEST 216END_TEST
219 217
220START_TEST (elm_atspi_children_and_parent) 218START_TEST (test_efl_access_children_and_parent)
221{ 219{
222 elm_init(0, NULL); 220 elm_init(0, NULL);
223 221
@@ -226,9 +224,9 @@ START_TEST (elm_atspi_children_and_parent)
226 224
227 Eina_List *child_list = NULL; 225 Eina_List *child_list = NULL;
228 226
229 child_list = elm_interface_atspi_accessible_children_get(root); 227 child_list = efl_access_children_get(root);
230 228
231 //bg_child_list = elm_interface_atspi_accessible_children_get(eina_list_nth(child_list, 0)); 229 //bg_child_list = efl_access_children_get(eina_list_nth(child_list, 0));
232 230
233 ck_assert(eina_list_count(child_list) == 1); 231 ck_assert(eina_list_count(child_list) == 1);
234 232
@@ -244,7 +242,7 @@ START_TEST (elm_atspi_children_and_parent)
244} 242}
245END_TEST 243END_TEST
246 244
247START_TEST (elm_atspi_children_and_parent2) 245START_TEST (test_efl_access_children_and_parent2)
248{ 246{
249 elm_init(0, NULL); 247 elm_init(0, NULL);
250 248
@@ -254,11 +252,11 @@ START_TEST (elm_atspi_children_and_parent2)
254 Eo *win = NULL; 252 Eo *win = NULL;
255 253
256 Eina_List *root_children; 254 Eina_List *root_children;
257 root_children = elm_interface_atspi_accessible_children_get(root); 255 root_children = efl_access_children_get(root);
258 win = eina_list_nth(root_children, 0); 256 win = eina_list_nth(root_children, 0);
259 257
260 Eina_List *win_children; 258 Eina_List *win_children;
261 win_children = elm_interface_atspi_accessible_children_get(win); 259 win_children = efl_access_children_get(win);
262 260
263 ck_assert(eina_list_count(win_children) == 1); 261 ck_assert(eina_list_count(win_children) == 1);
264 262
@@ -274,14 +272,14 @@ START_TEST (elm_atspi_children_and_parent2)
274END_TEST 272END_TEST
275 273
276/* Initial value of translation domain should be NULL */ 274/* Initial value of translation domain should be NULL */
277START_TEST (elm_atspi_translation_domain_get) 275START_TEST (test_efl_access_translation_domain_get)
278{ 276{
279 elm_init(0, NULL); 277 elm_init(0, NULL);
280 generate_app(); 278 generate_app();
281 279
282 const char *domain; 280 const char *domain;
283 281
284 domain = elm_interface_atspi_accessible_translation_domain_get(g_btn); 282 domain = efl_access_translation_domain_get(g_btn);
285 283
286 ck_assert(domain == NULL); 284 ck_assert(domain == NULL);
287 285
@@ -289,21 +287,21 @@ START_TEST (elm_atspi_translation_domain_get)
289} 287}
290END_TEST 288END_TEST
291 289
292START_TEST (elm_atspi_translation_domain_set) 290START_TEST (test_efl_access_translation_domain_set)
293{ 291{
294 elm_init(0, NULL); 292 elm_init(0, NULL);
295 generate_app(); 293 generate_app();
296 294
297 const char *domain; 295 const char *domain;
298 296
299 elm_interface_atspi_accessible_translation_domain_set(g_btn, "Test translation_domain"); 297 efl_access_translation_domain_set(g_btn, "Test translation_domain");
300 domain = elm_interface_atspi_accessible_translation_domain_get(g_btn); 298 domain = efl_access_translation_domain_get(g_btn);
301 299
302 ck_assert(domain != NULL); 300 ck_assert(domain != NULL);
303 ck_assert_str_eq(domain, "Test translation_domain"); 301 ck_assert_str_eq(domain, "Test translation_domain");
304 302
305 elm_interface_atspi_accessible_translation_domain_set(g_btn, NULL); 303 efl_access_translation_domain_set(g_btn, NULL);
306 domain = elm_interface_atspi_accessible_translation_domain_get(g_btn); 304 domain = efl_access_translation_domain_get(g_btn);
307 305
308 ck_assert(domain == NULL); 306 ck_assert(domain == NULL);
309 307
@@ -311,18 +309,18 @@ START_TEST (elm_atspi_translation_domain_set)
311} 309}
312END_TEST 310END_TEST
313 311
314START_TEST (elm_atspi_relationship_append) 312START_TEST (test_efl_access_relationship_append)
315{ 313{
316 elm_init(0, NULL); 314 elm_init(0, NULL);
317 generate_app(); 315 generate_app();
318 316
319 Elm_Atspi_Relation_Set set; 317 Efl_Access_Relation_Set set;
320 Elm_Atspi_Relation *rel, *rel_to, *rel_from; 318 Efl_Access_Relation *rel, *rel_to, *rel_from;
321 Eina_List *l; 319 Eina_List *l;
322 320
323 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); 321 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
324 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win); 322 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win);
325 set = elm_interface_atspi_accessible_relation_set_get(g_btn); 323 set = efl_access_relation_set_get(g_btn);
326 324
327 ck_assert(set != NULL); 325 ck_assert(set != NULL);
328 ck_assert(eina_list_count(set) >= 2); 326 ck_assert(eina_list_count(set) >= 2);
@@ -330,9 +328,9 @@ START_TEST (elm_atspi_relationship_append)
330 rel_to = rel_from = NULL; 328 rel_to = rel_from = NULL;
331 EINA_LIST_FOREACH(set, l, rel) 329 EINA_LIST_FOREACH(set, l, rel)
332 { 330 {
333 if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO) 331 if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO)
334 rel_to = rel; 332 rel_to = rel;
335 if (rel->type == ELM_ATSPI_RELATION_FLOWS_FROM) 333 if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM)
336 rel_from = rel; 334 rel_from = rel;
337 } 335 }
338 336
@@ -342,19 +340,19 @@ START_TEST (elm_atspi_relationship_append)
342 ck_assert(rel_from != NULL); 340 ck_assert(rel_from != NULL);
343 ck_assert(eina_list_data_find(rel_from->objects, g_win) != NULL); 341 ck_assert(eina_list_data_find(rel_from->objects, g_win) != NULL);
344 342
345 elm_atspi_relation_set_free(set); 343 efl_access_relation_set_free(set);
346 344
347 /* Check if append do not procude duplicated relations */ 345 /* Check if append do not procude duplicated relations */
348 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); 346 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
349 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win); 347 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win);
350 set = elm_interface_atspi_accessible_relation_set_get(g_btn); 348 set = efl_access_relation_set_get(g_btn);
351 349
352 rel_to = rel_from = NULL; 350 rel_to = rel_from = NULL;
353 EINA_LIST_FOREACH(set, l, rel) 351 EINA_LIST_FOREACH(set, l, rel)
354 { 352 {
355 if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO) 353 if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO)
356 rel_to = rel; 354 rel_to = rel;
357 if (rel->type == ELM_ATSPI_RELATION_FLOWS_FROM) 355 if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM)
358 rel_from = rel; 356 rel_from = rel;
359 } 357 }
360 358
@@ -368,26 +366,26 @@ START_TEST (elm_atspi_relationship_append)
368 rel_from->objects = eina_list_remove(rel_from->objects, g_win); 366 rel_from->objects = eina_list_remove(rel_from->objects, g_win);
369 ck_assert(eina_list_data_find(rel_from->objects, g_win) == NULL); 367 ck_assert(eina_list_data_find(rel_from->objects, g_win) == NULL);
370 368
371 elm_atspi_relation_set_free(set); 369 efl_access_relation_set_free(set);
372 370
373 elm_shutdown(); 371 elm_shutdown();
374} 372}
375END_TEST 373END_TEST
376 374
377START_TEST (elm_atspi_relationship_remove) 375START_TEST (test_efl_access_relationship_remove)
378{ 376{
379 elm_init(0, NULL); 377 elm_init(0, NULL);
380 generate_app(); 378 generate_app();
381 379
382 Elm_Atspi_Relation_Set set; 380 Efl_Access_Relation_Set set;
383 Elm_Atspi_Relation *rel, *rel_to, *rel_from; 381 Efl_Access_Relation *rel, *rel_to, *rel_from;
384 Eina_List *l; 382 Eina_List *l;
385 383
386 /* Test if removal of single relationship works */ 384 /* Test if removal of single relationship works */
387 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); 385 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
388 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win); 386 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win);
389 elm_interface_atspi_accessible_relationship_remove(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); 387 efl_access_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
390 set = elm_interface_atspi_accessible_relation_set_get(g_btn); 388 set = efl_access_relation_set_get(g_btn);
391 389
392 ck_assert(set != NULL); 390 ck_assert(set != NULL);
393 ck_assert(eina_list_count(set) >= 1); 391 ck_assert(eina_list_count(set) >= 1);
@@ -395,9 +393,9 @@ START_TEST (elm_atspi_relationship_remove)
395 rel_to = rel_from = NULL; 393 rel_to = rel_from = NULL;
396 EINA_LIST_FOREACH(set, l, rel) 394 EINA_LIST_FOREACH(set, l, rel)
397 { 395 {
398 if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO) 396 if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO)
399 rel_to = rel; 397 rel_to = rel;
400 if (rel->type == ELM_ATSPI_RELATION_FLOWS_FROM) 398 if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM)
401 rel_from = rel; 399 rel_from = rel;
402 } 400 }
403 401
@@ -405,20 +403,20 @@ START_TEST (elm_atspi_relationship_remove)
405 ck_assert(rel_from != NULL); 403 ck_assert(rel_from != NULL);
406 ck_assert(eina_list_data_find(rel_from->objects, g_win) != NULL); 404 ck_assert(eina_list_data_find(rel_from->objects, g_win) != NULL);
407 405
408 elm_atspi_relation_set_free(set); 406 efl_access_relation_set_free(set);
409 407
410 /* Test if removal of type relationship works */ 408 /* Test if removal of type relationship works */
411 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); 409 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
412 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_win); 410 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win);
413 elm_interface_atspi_accessible_relationship_remove(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, NULL); 411 efl_access_relationship_remove(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, NULL);
414 set = elm_interface_atspi_accessible_relation_set_get(g_btn); 412 set = efl_access_relation_set_get(g_btn);
415 413
416 rel_to = rel_from = NULL; 414 rel_to = rel_from = NULL;
417 EINA_LIST_FOREACH(set, l, rel) 415 EINA_LIST_FOREACH(set, l, rel)
418 { 416 {
419 if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO) 417 if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO)
420 rel_to = rel; 418 rel_to = rel;
421 if (rel->type == ELM_ATSPI_RELATION_FLOWS_FROM) 419 if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM)
422 rel_from = rel; 420 rel_from = rel;
423 } 421 }
424 422
@@ -426,77 +424,77 @@ START_TEST (elm_atspi_relationship_remove)
426 ck_assert(rel_from != NULL); 424 ck_assert(rel_from != NULL);
427 ck_assert(eina_list_data_find(rel_from->objects, g_win) != NULL); 425 ck_assert(eina_list_data_find(rel_from->objects, g_win) != NULL);
428 426
429 elm_atspi_relation_set_free(set); 427 efl_access_relation_set_free(set);
430 428
431 /* Test if relationship is implicity removed when object is deleted */ 429 /* Test if relationship is implicity removed when object is deleted */
432 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); 430 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
433 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_bg); 431 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg);
434 efl_del(g_bg); 432 efl_del(g_bg);
435 set = elm_interface_atspi_accessible_relation_set_get(g_btn); 433 set = efl_access_relation_set_get(g_btn);
436 434
437 rel_to = rel_from = NULL; 435 rel_to = rel_from = NULL;
438 EINA_LIST_FOREACH(set, l, rel) 436 EINA_LIST_FOREACH(set, l, rel)
439 { 437 {
440 if (rel->type == ELM_ATSPI_RELATION_FLOWS_TO) 438 if (rel->type == EFL_ACCESS_RELATION_FLOWS_TO)
441 rel_to = rel; 439 rel_to = rel;
442 if (rel->type == ELM_ATSPI_RELATION_FLOWS_FROM) 440 if (rel->type == EFL_ACCESS_RELATION_FLOWS_FROM)
443 rel_from = rel; 441 rel_from = rel;
444 } 442 }
445 443
446 if (rel_to) ck_assert(eina_list_data_find(rel_to->objects, g_bg) == NULL); 444 if (rel_to) ck_assert(eina_list_data_find(rel_to->objects, g_bg) == NULL);
447 if (rel_from) ck_assert(eina_list_data_find(rel_from->objects, g_bg) == NULL); 445 if (rel_from) ck_assert(eina_list_data_find(rel_from->objects, g_bg) == NULL);
448 446
449 elm_atspi_relation_set_free(set); 447 efl_access_relation_set_free(set);
450 elm_shutdown(); 448 elm_shutdown();
451} 449}
452END_TEST 450END_TEST
453 451
454START_TEST (elm_atspi_relationships_clear) 452START_TEST (test_efl_access_relationships_clear)
455{ 453{
456 Elm_Atspi_Relation_Set set; 454 Efl_Access_Relation_Set set;
457 Elm_Atspi_Relation *rel; 455 Efl_Access_Relation *rel;
458 Eina_List *l; 456 Eina_List *l;
459 457
460 elm_init(0, NULL); 458 elm_init(0, NULL);
461 generate_app(); 459 generate_app();
462 460
463 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_bg); 461 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_bg);
464 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_bg); 462 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_bg);
465 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_TO, g_win); 463 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_TO, g_win);
466 elm_interface_atspi_accessible_relationship_append(g_btn, ELM_ATSPI_RELATION_FLOWS_FROM, g_win); 464 efl_access_relationship_append(g_btn, EFL_ACCESS_RELATION_FLOWS_FROM, g_win);
467 465
468 elm_interface_atspi_accessible_relationships_clear(g_btn); 466 efl_access_relationships_clear(g_btn);
469 467
470 set = elm_interface_atspi_accessible_relation_set_get(g_btn); 468 set = efl_access_relation_set_get(g_btn);
471 EINA_LIST_FOREACH(set, l, rel) 469 EINA_LIST_FOREACH(set, l, rel)
472 { 470 {
473 ck_assert(!((rel->type == ELM_ATSPI_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_bg))); 471 ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_bg)));
474 ck_assert(!((rel->type == ELM_ATSPI_RELATION_FLOWS_FROM) && eina_list_data_find(rel->objects, g_bg))); 472 ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) && eina_list_data_find(rel->objects, g_bg)));
475 ck_assert(!((rel->type == ELM_ATSPI_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_win))); 473 ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_TO) && eina_list_data_find(rel->objects, g_win)));
476 ck_assert(!((rel->type == ELM_ATSPI_RELATION_FLOWS_FROM) && eina_list_data_find(rel->objects, g_win))); 474 ck_assert(!((rel->type == EFL_ACCESS_RELATION_FLOWS_FROM) && eina_list_data_find(rel->objects, g_win)));
477 } 475 }
478 476
479 elm_atspi_relation_set_free(set); 477 efl_access_relation_set_free(set);
480 elm_shutdown(); 478 elm_shutdown();
481} 479}
482END_TEST 480END_TEST
483 481
484void elm_test_atspi(TCase *tc) 482void elm_test_atspi(TCase *tc)
485{ 483{
486 tcase_add_test(tc, elm_atspi_app_obj_name_get); 484 tcase_add_test(tc, test_efl_access_app_obj_name_get);
487 tcase_add_test(tc, elm_atspi_name_get); 485 tcase_add_test(tc, test_efl_access_name_get);
488 tcase_add_test(tc, elm_atspi_name_set); 486 tcase_add_test(tc, test_efl_access_name_set);
489 tcase_add_test(tc, elm_atspi_role_get); 487 tcase_add_test(tc, test_efl_access_role_get);
490 tcase_add_test(tc, elm_atspi_role_set); 488 tcase_add_test(tc, test_efl_access_role_set);
491 tcase_add_test(tc, elm_atspi_role_name_get); 489 tcase_add_test(tc, test_efl_access_role_name_get);
492 tcase_add_test(tc, elm_atspi_localized_role_name_get); 490 tcase_add_test(tc, test_efl_access_localized_role_name_get);
493 tcase_add_test(tc, elm_atspi_description_set); 491 tcase_add_test(tc, test_efl_access_description_set);
494 tcase_add_test(tc, elm_atspi_description_get); 492 tcase_add_test(tc, test_efl_access_description_get);
495 tcase_add_test(tc, elm_atspi_children_and_parent); 493 tcase_add_test(tc, test_efl_access_children_and_parent);
496 tcase_add_test(tc, elm_atspi_children_and_parent2); 494 tcase_add_test(tc, test_efl_access_children_and_parent2);
497 tcase_add_test(tc, elm_atspi_translation_domain_get); 495 tcase_add_test(tc, test_efl_access_translation_domain_get);
498 tcase_add_test(tc, elm_atspi_translation_domain_set); 496 tcase_add_test(tc, test_efl_access_translation_domain_set);
499 tcase_add_test(tc, elm_atspi_relationship_append); 497 tcase_add_test(tc, test_efl_access_relationship_append);
500 tcase_add_test(tc, elm_atspi_relationship_remove); 498 tcase_add_test(tc, test_efl_access_relationship_remove);
501 tcase_add_test(tc, elm_atspi_relationships_clear); 499 tcase_add_test(tc, test_efl_access_relationships_clear);
502} 500}
diff --git a/src/tests/elementary/elm_test_box.c b/src/tests/elementary/elm_test_box.c
index eb14a53..ca675f2 100644
--- a/src/tests/elementary/elm_test_box.c
+++ b/src/tests/elementary/elm_test_box.c
@@ -2,22 +2,22 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
9START_TEST (elm_atspi_role_get) 9START_TEST (elm_atspi_role_get)
10{ 10{
11 Evas_Object *win, *box; 11 Evas_Object *win, *box;
12 Elm_Atspi_Role role; 12 Efl_Access_Role role;
13 13
14 elm_init(1, NULL); 14 elm_init(1, NULL);
15 win = elm_win_add(NULL, "box", ELM_WIN_BASIC); 15 win = elm_win_add(NULL, "box", ELM_WIN_BASIC);
16 16
17 box = elm_box_add(win); 17 box = elm_box_add(win);
18 role = elm_interface_atspi_accessible_role_get(box); 18 role = efl_access_role_get(box);
19 19
20 ck_assert(role == ELM_ATSPI_ROLE_FILLER); 20 ck_assert(role == EFL_ACCESS_ROLE_FILLER);
21 21
22 elm_shutdown(); 22 elm_shutdown();
23} 23}
diff --git a/src/tests/elementary/elm_test_bubble.c b/src/tests/elementary/elm_test_bubble.c
index bbae3ce..c227b4e 100644
--- a/src/tests/elementary/elm_test_bubble.c
+++ b/src/tests/elementary/elm_test_bubble.c
@@ -2,22 +2,22 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
9START_TEST (elm_atspi_role_get) 9START_TEST (elm_atspi_role_get)
10{ 10{
11 Evas_Object *win, *bubble; 11 Evas_Object *win, *bubble;
12 Elm_Atspi_Role role; 12 Efl_Access_Role role;
13 13
14 elm_init(1, NULL); 14 elm_init(1, NULL);
15 win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC); 15 win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC);
16 16
17 bubble = elm_bubble_add(win); 17 bubble = elm_bubble_add(win);
18 role = elm_interface_atspi_accessible_role_get(bubble); 18 role = efl_access_role_get(bubble);
19 19
20 ck_assert(role == ELM_ATSPI_ROLE_FILLER); 20 ck_assert(role == EFL_ACCESS_ROLE_FILLER);
21 21
22 elm_shutdown(); 22 elm_shutdown();
23} 23}
diff --git a/src/tests/elementary/elm_test_button.c b/src/tests/elementary/elm_test_button.c
index a07abc4..ed35524 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
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>
@@ -11,15 +11,15 @@
11START_TEST (elm_atspi_role_get) 11START_TEST (elm_atspi_role_get)
12{ 12{
13 Evas_Object *win, *button; 13 Evas_Object *win, *button;
14 Elm_Atspi_Role role; 14 Efl_Access_Role role;
15 15
16 elm_init(1, NULL); 16 elm_init(1, NULL);
17 win = elm_win_add(NULL, "button", ELM_WIN_BASIC); 17 win = elm_win_add(NULL, "button", ELM_WIN_BASIC);
18 18
19 button = elm_button_add(win); 19 button = elm_button_add(win);
20 role = elm_interface_atspi_accessible_role_get(button); 20 role = efl_access_role_get(button);
21 21
22 ck_assert(role == ELM_ATSPI_ROLE_PUSH_BUTTON); 22 ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON);
23 23
24 elm_shutdown(); 24 elm_shutdown();
25} 25}
@@ -34,7 +34,7 @@ START_TEST (elm_atspi_interfaces_check)
34 34
35 button = elm_button_add(win); 35 button = elm_button_add(win);
36 36
37 ck_assert(efl_isa(button, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)); 37 ck_assert(efl_isa(button, EFL_ACCESS_MIXIN));
38 ck_assert(efl_isa(button, EFL_ACCESS_COMPONENT_MIXIN)); 38 ck_assert(efl_isa(button, EFL_ACCESS_COMPONENT_MIXIN));
39 ck_assert(efl_isa(button, EFL_ACCESS_ACTION_MIXIN)); 39 ck_assert(efl_isa(button, EFL_ACCESS_ACTION_MIXIN));
40 40
diff --git a/src/tests/elementary/elm_test_calendar.c b/src/tests/elementary/elm_test_calendar.c
index 433b5d1..866b60d 100644
--- a/src/tests/elementary/elm_test_calendar.c
+++ b/src/tests/elementary/elm_test_calendar.c
@@ -2,22 +2,22 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
9START_TEST (elm_atspi_role_get) 9START_TEST (elm_atspi_role_get)
10{ 10{
11 Evas_Object *win, *calendar; 11 Evas_Object *win, *calendar;
12 Elm_Atspi_Role role; 12 Efl_Access_Role role;
13 13
14 elm_init(1, NULL); 14 elm_init(1, NULL);
15 win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC); 15 win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC);
16 16
17 calendar = elm_calendar_add(win); 17 calendar = elm_calendar_add(win);
18 role = elm_interface_atspi_accessible_role_get(calendar); 18 role = efl_access_role_get(calendar);
19 19
20 ck_assert(role == ELM_ATSPI_ROLE_CALENDAR); 20 ck_assert(role == EFL_ACCESS_ROLE_CALENDAR);
21 21
22 elm_shutdown(); 22 elm_shutdown();
23} 23}
diff --git a/src/tests/elementary/elm_test_check.c b/src/tests/elementary/elm_test_check.c
index 8abfe3a..b498ee9 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -53,15 +53,15 @@ END_TEST
53START_TEST (elm_atspi_role_get) 53START_TEST (elm_atspi_role_get)
54{ 54{
55 Evas_Object *win, *check; 55 Evas_Object *win, *check;
56 Elm_Atspi_Role role; 56 Efl_Access_Role role;
57 57
58 elm_init(1, NULL); 58 elm_init(1, NULL);
59 win = elm_win_add(NULL, "check", ELM_WIN_BASIC); 59 win = elm_win_add(NULL, "check", ELM_WIN_BASIC);
60 60
61 check = elm_check_add(win); 61 check = elm_check_add(win);
62 role = elm_interface_atspi_accessible_role_get(check); 62 role = efl_access_role_get(check);
63 63
64 ck_assert(role == ELM_ATSPI_ROLE_CHECK_BOX); 64 ck_assert(role == EFL_ACCESS_ROLE_CHECK_BOX);
65 65
66 elm_shutdown(); 66 elm_shutdown();
67} 67}
diff --git a/src/tests/elementary/elm_test_clock.c b/src/tests/elementary/elm_test_clock.c
index 713858d..34c5a95 100644
--- a/src/tests/elementary/elm_test_clock.c
+++ b/src/tests/elementary/elm_test_clock.c
@@ -2,22 +2,22 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
9START_TEST (elm_atspi_role_get) 9START_TEST (elm_atspi_role_get)
10{ 10{
11 Evas_Object *win, *clk; 11 Evas_Object *win, *clk;
12 Elm_Atspi_Role role; 12 Efl_Access_Role role;
13 13
14 elm_init(1, NULL); 14 elm_init(1, NULL);
15 win = elm_win_add(NULL, "clock", ELM_WIN_BASIC); 15 win = elm_win_add(NULL, "clock", ELM_WIN_BASIC);
16 16
17 clk = elm_clock_add(win); 17 clk = elm_clock_add(win);
18 role = elm_interface_atspi_accessible_role_get(clk); 18 role = efl_access_role_get(clk);
19 19
20 ck_assert(role == ELM_ATSPI_ROLE_TEXT); 20 ck_assert(role == EFL_ACCESS_ROLE_TEXT);
21 21
22 elm_shutdown(); 22 elm_shutdown();
23} 23}
diff --git a/src/tests/elementary/elm_test_colorselector.c b/src/tests/elementary/elm_test_colorselector.c
index 321f3df..472e61e 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -36,15 +36,15 @@ END_TEST
36START_TEST (elm_atspi_role_get) 36START_TEST (elm_atspi_role_get)
37{ 37{
38 Evas_Object *win, *c; 38 Evas_Object *win, *c;
39 Elm_Atspi_Role role; 39 Efl_Access_Role role;
40 40
41 elm_init(1, NULL); 41 elm_init(1, NULL);
42 win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC); 42 win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC);
43 43
44 c = elm_colorselector_add(win); 44 c = elm_colorselector_add(win);
45 role = elm_interface_atspi_accessible_role_get(c); 45 role = efl_access_role_get(c);
46 46
47 ck_assert(role == ELM_ATSPI_ROLE_COLOR_CHOOSER); 47 ck_assert(role == EFL_ACCESS_ROLE_COLOR_CHOOSER);
48 48
49 elm_shutdown(); 49 elm_shutdown();
50} 50}
diff --git a/src/tests/elementary/elm_test_config.c b/src/tests/elementary/elm_test_config.c
index f1c6b14..d2d880e 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_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 a646e5e..60e3087 100644
--- a/src/tests/elementary/elm_test_conformant.c
+++ b/src/tests/elementary/elm_test_conformant.c
@@ -2,22 +2,22 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
9START_TEST (elm_atspi_role_get) 9START_TEST (elm_atspi_role_get)
10{ 10{
11 Evas_Object *win, *conformant; 11 Evas_Object *win, *conformant;
12 Elm_Atspi_Role role; 12 Efl_Access_Role role;
13 13
14 elm_init(1, NULL); 14 elm_init(1, NULL);
15 win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC); 15 win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC);
16 16
17 conformant = elm_conformant_add(win); 17 conformant = elm_conformant_add(win);
18 role = elm_interface_atspi_accessible_role_get(conformant); 18 role = efl_access_role_get(conformant);
19 19
20 ck_assert(role == ELM_ATSPI_ROLE_FILLER); 20 ck_assert(role == EFL_ACCESS_ROLE_FILLER);
21 21
22 elm_shutdown(); 22 elm_shutdown();
23} 23}
diff --git a/src/tests/elementary/elm_test_ctxpopup.c b/src/tests/elementary/elm_test_ctxpopup.c
index 5c5ed6f..8db2564 100644
--- a/src/tests/elementary/elm_test_ctxpopup.c
+++ b/src/tests/elementary/elm_test_ctxpopup.c
@@ -2,22 +2,22 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
9START_TEST (elm_atspi_role_get) 9START_TEST (elm_atspi_role_get)
10{ 10{
11 Evas_Object *win, *ctxpopup; 11 Evas_Object *win, *ctxpopup;
12 Elm_Atspi_Role role; 12 Efl_Access_Role role;
13 13
14 elm_init(1, NULL); 14 elm_init(1, NULL);
15 win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); 15 win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
16 16
17 ctxpopup = elm_ctxpopup_add(win); 17 ctxpopup = elm_ctxpopup_add(win);
18 role = elm_interface_atspi_accessible_role_get(ctxpopup); 18 role = efl_access_role_get(ctxpopup);
19 19
20 ck_assert(role == ELM_ATSPI_ROLE_POPUP_MENU); 20 ck_assert(role == EFL_ACCESS_ROLE_POPUP_MENU);
21 21
22 elm_shutdown(); 22 elm_shutdown();
23} 23}
diff --git a/src/tests/elementary/elm_test_datetime.c b/src/tests/elementary/elm_test_datetime.c
index 0935f88..67cd56f 100644
--- a/src/tests/elementary/elm_test_datetime.c
+++ b/src/tests/elementary/elm_test_datetime.c
@@ -2,22 +2,22 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
9START_TEST (elm_atspi_role_get) 9START_TEST (elm_atspi_role_get)
10{ 10{
11 Evas_Object *win, *datetime; 11 Evas_Object *win, *datetime;
12 Elm_Atspi_Role role; 12 Efl_Access_Role role;
13 13
14 elm_init(1, NULL); 14 elm_init(1, NULL);
15 win = elm_win_add(NULL, "datetime", ELM_WIN_BASIC); 15 win = elm_win_add(NULL, "datetime", ELM_WIN_BASIC);
16 16
17 datetime = elm_datetime_add(win); 17 datetime = elm_datetime_add(win);
18 role = elm_interface_atspi_accessible_role_get(datetime); 18 role = efl_access_role_get(datetime);
19 19
20 ck_assert(role == ELM_ATSPI_ROLE_DATE_EDITOR); 20 ck_assert(role == EFL_ACCESS_ROLE_DATE_EDITOR);
21 21
22 elm_shutdown(); 22 elm_shutdown();
23} 23}
diff --git a/src/tests/elementary/elm_test_dayselector.c b/src/tests/elementary/elm_test_dayselector.c
index d4f0288..9c5fe71 100644
--- a/src/tests/elementary/elm_test_dayselector.c
+++ b/src/tests/elementary/elm_test_dayselector.c
@@ -2,22 +2,22 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
9START_TEST (elm_atspi_role_get) 9START_TEST (elm_atspi_role_get)
10{ 10{
11 Evas_Object *win, *dayselector; 11 Evas_Object *win, *dayselector;
12 Elm_Atspi_Role role; 12 Efl_Access_Role role;
13 13
14 elm_init(1, NULL); 14 elm_init(1, NULL);
15 win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC); 15 win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC);
16 16
17 dayselector = elm_dayselector_add(win); 17 dayselector = elm_dayselector_add(win);
18 role = elm_interface_atspi_accessible_role_get(dayselector); 18 role = efl_access_role_get(dayselector);
19 19
20 ck_assert(role == ELM_ATSPI_ROLE_PANEL); 20 ck_assert(role == EFL_ACCESS_ROLE_PANEL);
21 21
22 elm_shutdown(); 22 elm_shutdown();
23} 23}
diff --git a/src/tests/elementary/elm_test_diskselector.c b/src/tests/elementary/elm_test_diskselector.c
index e902939..ab9752d 100644
--- a/src/tests/elementary/elm_test_diskselector.c
+++ b/src/tests/elementary/elm_test_diskselector.c
@@ -2,22 +2,22 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
9START_TEST (elm_atspi_role_get) 9START_TEST (elm_atspi_role_get)
10{ 10{
11 Evas_Object *win, *diskselector; 11 Evas_Object *win, *diskselector;
12 Elm_Atspi_Role role; 12 Efl_Access_Role role;
13 13
14 elm_init(1, NULL); 14 elm_init(1, NULL);
15 win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC); 15 win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC);
16 16
17 diskselector = elm_diskselector_add(win); 17 diskselector = elm_diskselector_add(win);
18 role = elm_interface_atspi_accessible_role_get(diskselector); 18 role = efl_access_role_get(diskselector);
19 19
20 ck_assert(role == ELM_ATSPI_ROLE_LIST); 20 ck_assert(role == EFL_ACCESS_ROLE_LIST);
21 21
22 elm_shutdown(); 22 elm_shutdown();
23} 23}
diff --git a/src/tests/elementary/elm_test_entry.c b/src/tests/elementary/elm_test_entry.c
index e2a9a5d..fe412cc 100644
--- a/src/tests/elementary/elm_test_entry.c
+++ b/src/tests/elementary/elm_test_entry.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4 4
5#define EFL_ACCESS_TEXT_PROTECTED 5#define EFL_ACCESS_TEXT_PROTECTED
6#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 6#define EFL_ACCESS_PROTECTED
7#include <Elementary.h> 7#include <Elementary.h>
8#include "elm_suite.h" 8#include "elm_suite.h"
9 9
@@ -380,15 +380,15 @@ END_TEST
380START_TEST (elm_atspi_role_get) 380START_TEST (elm_atspi_role_get)
381{ 381{
382 Evas_Object *win, *entry; 382 Evas_Object *win, *entry;
383 Elm_Atspi_Role role; 383 Efl_Access_Role role;
384 384
385 elm_init(1, NULL); 385 elm_init(1, NULL);
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 = elm_interface_atspi_accessible_role_get(entry); 389 role = efl_access_role_get(entry);
390 390
391 ck_assert(role == ELM_ATSPI_ROLE_ENTRY); 391 ck_assert(role == EFL_ACCESS_ROLE_ENTRY);
392 392
393 elm_shutdown(); 393 elm_shutdown();
394} 394}
diff --git a/src/tests/elementary/elm_test_fileselector.c b/src/tests/elementary/elm_test_fileselector.c
index 8800543..de78924 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *fileselector; 12 Evas_Object *win, *fileselector;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC);
17 17
18 fileselector = elm_fileselector_add(win); 18 fileselector = elm_fileselector_add(win);
19 role = elm_interface_atspi_accessible_role_get(fileselector); 19 role = efl_access_role_get(fileselector);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_FILE_CHOOSER); 21 ck_assert(role == EFL_ACCESS_ROLE_FILE_CHOOSER);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_fileselector_button.c b/src/tests/elementary/elm_test_fileselector_button.c
index 653678d..586c441 100644
--- a/src/tests/elementary/elm_test_fileselector_button.c
+++ b/src/tests/elementary/elm_test_fileselector_button.c
@@ -2,22 +2,22 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
9START_TEST (elm_atspi_role_get) 9START_TEST (elm_atspi_role_get)
10{ 10{
11 Evas_Object *win, *fs_button; 11 Evas_Object *win, *fs_button;
12 Elm_Atspi_Role role; 12 Efl_Access_Role role;
13 13
14 elm_init(1, NULL); 14 elm_init(1, NULL);
15 win = elm_win_add(NULL, "fileselector_button", ELM_WIN_BASIC); 15 win = elm_win_add(NULL, "fileselector_button", ELM_WIN_BASIC);
16 16
17 fs_button = elm_fileselector_button_add(win); 17 fs_button = elm_fileselector_button_add(win);
18 role = elm_interface_atspi_accessible_role_get(fs_button); 18 role = efl_access_role_get(fs_button);
19 19
20 ck_assert(role == ELM_ATSPI_ROLE_PUSH_BUTTON); 20 ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON);
21 21
22 elm_shutdown(); 22 elm_shutdown();
23} 23}
diff --git a/src/tests/elementary/elm_test_fileselector_entry.c b/src/tests/elementary/elm_test_fileselector_entry.c
index d78cf1b..86fae96 100644
--- a/src/tests/elementary/elm_test_fileselector_entry.c
+++ b/src/tests/elementary/elm_test_fileselector_entry.c
@@ -2,22 +2,22 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
9START_TEST (elm_atspi_role_get) 9START_TEST (elm_atspi_role_get)
10{ 10{
11 Evas_Object *win, *fs_entry; 11 Evas_Object *win, *fs_entry;
12 Elm_Atspi_Role role; 12 Efl_Access_Role role;
13 13
14 elm_init(1, NULL); 14 elm_init(1, NULL);
15 win = elm_win_add(NULL, "fileselectorentry", ELM_WIN_BASIC); 15 win = elm_win_add(NULL, "fileselectorentry", ELM_WIN_BASIC);
16 16
17 fs_entry = elm_fileselector_entry_add(win); 17 fs_entry = elm_fileselector_entry_add(win);
18 role = elm_interface_atspi_accessible_role_get(fs_entry); 18 role = efl_access_role_get(fs_entry);
19 19
20 ck_assert(role == ELM_ATSPI_ROLE_GROUPING); 20 ck_assert(role == EFL_ACCESS_ROLE_GROUPING);
21 21
22 elm_shutdown(); 22 elm_shutdown();
23} 23}
diff --git a/src/tests/elementary/elm_test_flip.c b/src/tests/elementary/elm_test_flip.c
index 947c020..a5d74b3 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *flip; 12 Evas_Object *win, *flip;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "flip", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "flip", ELM_WIN_BASIC);
17 17
18 flip = elm_flip_add(win); 18 flip = elm_flip_add(win);
19 role = elm_interface_atspi_accessible_role_get(flip); 19 role = efl_access_role_get(flip);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_PAGE_TAB_LIST); 21 ck_assert(role == EFL_ACCESS_ROLE_PAGE_TAB_LIST);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_flipselector.c b/src/tests/elementary/elm_test_flipselector.c
index 2ede134..fbbf0b0 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *flipselector; 12 Evas_Object *win, *flipselector;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC);
17 17
18 flipselector = elm_flipselector_add(win); 18 flipselector = elm_flipselector_add(win);
19 role = elm_interface_atspi_accessible_role_get(flipselector); 19 role = efl_access_role_get(flipselector);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_LIST); 21 ck_assert(role == EFL_ACCESS_ROLE_LIST);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_focus_common.h b/src/tests/elementary/elm_test_focus_common.h
index 13587ef..7105d7f 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 8#define EFL_ACCESS_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 2527544..fe3cea7 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *frame; 12 Evas_Object *win, *frame;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "frame", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "frame", ELM_WIN_BASIC);
17 17
18 frame = elm_frame_add(win); 18 frame = elm_frame_add(win);
19 role = elm_interface_atspi_accessible_role_get(frame); 19 role = efl_access_role_get(frame);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_FRAME); 21 ck_assert(role == EFL_ACCESS_ROLE_FRAME);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_gengrid.c b/src/tests/elementary/elm_test_gengrid.c
index 54e37e2..e83e419 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
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"
@@ -11,15 +11,15 @@
11START_TEST (elm_atspi_role_get) 11START_TEST (elm_atspi_role_get)
12{ 12{
13 Evas_Object *win, *gengrid; 13 Evas_Object *win, *gengrid;
14 Elm_Atspi_Role role; 14 Efl_Access_Role role;
15 15
16 elm_init(1, NULL); 16 elm_init(1, NULL);
17 win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC); 17 win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC);
18 18
19 gengrid = elm_gengrid_add(win); 19 gengrid = elm_gengrid_add(win);
20 role = elm_interface_atspi_accessible_role_get(gengrid); 20 role = efl_access_role_get(gengrid);
21 21
22 ck_assert(role == ELM_ATSPI_ROLE_TREE_TABLE); 22 ck_assert(role == EFL_ACCESS_ROLE_TREE_TABLE);
23 23
24 elm_shutdown(); 24 elm_shutdown();
25} 25}
@@ -53,7 +53,7 @@ START_TEST(elm_atspi_children_parent)
53 Evas_Object *gengrid = elm_gengrid_add(win); 53 Evas_Object *gengrid = elm_gengrid_add(win);
54 evas_object_resize(gengrid, 100, 100); 54 evas_object_resize(gengrid, 100, 100);
55 55
56 Elm_Interface_Atspi_Accessible *parent; 56 Efl_Access *parent;
57 content = NULL; 57 content = NULL;
58 58
59 itc.item_style = "default"; 59 itc.item_style = "default";
@@ -66,7 +66,7 @@ START_TEST(elm_atspi_children_parent)
66 elm_gengrid_item_fields_update(it, "*.", ELM_GENGRID_ITEM_FIELD_CONTENT); 66 elm_gengrid_item_fields_update(it, "*.", ELM_GENGRID_ITEM_FIELD_CONTENT);
67 67
68 ck_assert(content != NULL); 68 ck_assert(content != NULL);
69 parent = elm_interface_atspi_accessible_parent_get(content); 69 parent = efl_access_parent_get(content);
70 ck_assert(it == parent); 70 ck_assert(it == parent);
71 71
72 elm_shutdown(); 72 elm_shutdown();
diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c
index dd43419..fd1fd40 100644
--- a/src/tests/elementary/elm_test_genlist.c
+++ b/src/tests/elementary/elm_test_genlist.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,7 +10,7 @@ static Evas_Object *win, *genlist;
10static Elm_Gen_Item_Class itc; 10static Elm_Gen_Item_Class itc;
11static Eo *current; 11static Eo *current;
12static int counter; 12static int counter;
13static Elm_Atspi_Event_Children_Changed_Data ev_data; 13static Efl_Access_Event_Children_Changed_Data ev_data;
14Evas_Object *content; 14Evas_Object *content;
15 15
16 16
@@ -26,11 +26,11 @@ START_TEST (elm_atspi_role_get)
26{ 26{
27 test_init(); 27 test_init();
28 28
29 Elm_Atspi_Role role; 29 Efl_Access_Role role;
30 30
31 role = elm_interface_atspi_accessible_role_get(genlist); 31 role = efl_access_role_get(genlist);
32 32
33 ck_assert(role == ELM_ATSPI_ROLE_LIST); 33 ck_assert(role == EFL_ACCESS_ROLE_LIST);
34 34
35 elm_shutdown(); 35 elm_shutdown();
36} 36}
@@ -42,14 +42,14 @@ START_TEST(elm_atspi_children_get1)
42 Eina_List *children; 42 Eina_List *children;
43 Elm_Object_Item *it[3]; 43 Elm_Object_Item *it[3];
44 44
45 children = elm_interface_atspi_accessible_children_get(genlist); 45 children = efl_access_children_get(genlist);
46 ck_assert(children == NULL); 46 ck_assert(children == NULL);
47 47
48 it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); 48 it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
49 it[1] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); 49 it[1] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
50 it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); 50 it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
51 51
52 children = elm_interface_atspi_accessible_children_get(genlist); 52 children = efl_access_children_get(genlist);
53 ck_assert(eina_list_count(children) == 3); 53 ck_assert(eina_list_count(children) == 3);
54 ck_assert(eina_list_nth(children, 0) == it[0]); 54 ck_assert(eina_list_nth(children, 0) == it[0]);
55 ck_assert(eina_list_nth(children, 1) == it[1]); 55 ck_assert(eina_list_nth(children, 1) == it[1]);
@@ -71,7 +71,7 @@ START_TEST(elm_atspi_children_get2)
71 it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_GROUP, NULL, NULL); 71 it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_GROUP, NULL, NULL);
72 it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL); 72 it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL);
73 73
74 children = elm_interface_atspi_accessible_children_get(genlist); 74 children = efl_access_children_get(genlist);
75 ck_assert(eina_list_nth(children, 1) == it[0]); 75 ck_assert(eina_list_nth(children, 1) == it[0]);
76 ck_assert(eina_list_nth(children, 0) == it[1]); 76 ck_assert(eina_list_nth(children, 0) == it[1]);
77 ck_assert(eina_list_nth(children, 2) == it[2]); 77 ck_assert(eina_list_nth(children, 2) == it[2]);
@@ -83,10 +83,10 @@ END_TEST
83static void 83static void
84_children_changed_cb(void *data EINA_UNUSED, const Efl_Event *event) 84_children_changed_cb(void *data EINA_UNUSED, const Efl_Event *event)
85{ 85{
86 if (event->desc != ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED) 86 if (event->desc != EFL_ACCESS_EVENT_CHILDREN_CHANGED)
87 return; 87 return;
88 88
89 ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event->info; 89 ev_data = *(Efl_Access_Event_Children_Changed_Data*)event->info;
90 current = event->object; 90 current = event->object;
91 counter++; 91 counter++;
92} 92}
@@ -100,7 +100,7 @@ START_TEST(elm_atspi_children_events_add)
100 100
101 Elm_Object_Item *it[3]; 101 Elm_Object_Item *it[3];
102 102
103 elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _children_changed_cb, NULL); 103 efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL);
104 104
105 it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); 105 it[0] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
106 ck_assert(genlist == current); 106 ck_assert(genlist == current);
@@ -137,7 +137,7 @@ START_TEST(elm_atspi_children_events_del1)
137 it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); 137 it[1] = elm_genlist_item_prepend(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
138 it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL); 138 it[2] = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL);
139 139
140 elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _children_changed_cb, NULL); 140 efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL);
141 141
142 elm_object_item_del(it[0]); 142 elm_object_item_del(it[0]);
143 ck_assert(genlist == current); 143 ck_assert(genlist == current);
@@ -165,7 +165,7 @@ START_TEST(elm_atspi_children_events_del2)
165 165
166 it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); 166 it = elm_genlist_item_append(genlist, &itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
167 167
168 elm_interface_atspi_accessible_event_handler_add(ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN, _children_changed_cb, NULL); 168 efl_access_event_handler_add(EFL_ACCESS_MIXIN, _children_changed_cb, NULL);
169 elm_genlist_clear(genlist); 169 elm_genlist_clear(genlist);
170 170
171 ck_assert(genlist == current); 171 ck_assert(genlist == current);
diff --git a/src/tests/elementary/elm_test_glview.c b/src/tests/elementary/elm_test_glview.c
index 556c22f..09dc2cb 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,7 +10,7 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *glview; 12 Evas_Object *win, *glview;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "glview", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "glview", ELM_WIN_BASIC);
@@ -20,8 +20,8 @@ START_TEST (elm_atspi_role_get)
20 // if no gl backend skip test 20 // if no gl backend skip test
21 if (glview) 21 if (glview)
22 { 22 {
23 role = elm_interface_atspi_accessible_role_get(glview); 23 role = efl_access_role_get(glview);
24 ck_assert(role == ELM_ATSPI_ROLE_ANIMATION); 24 ck_assert(role == EFL_ACCESS_ROLE_ANIMATION);
25 } 25 }
26 26
27 elm_shutdown(); 27 elm_shutdown();
diff --git a/src/tests/elementary/elm_test_grid.c b/src/tests/elementary/elm_test_grid.c
index f1350d4..dfd977c 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *grid; 12 Evas_Object *win, *grid;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "grid", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "grid", ELM_WIN_BASIC);
17 17
18 grid = elm_grid_add(win); 18 grid = elm_grid_add(win);
19 role = elm_interface_atspi_accessible_role_get(grid); 19 role = efl_access_role_get(grid);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_FILLER); 21 ck_assert(role == EFL_ACCESS_ROLE_FILLER);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_hover.c b/src/tests/elementary/elm_test_hover.c
index b23f892..bbdc111 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *hover; 12 Evas_Object *win, *hover;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "hover", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "hover", ELM_WIN_BASIC);
17 17
18 hover = elm_hover_add(win); 18 hover = elm_hover_add(win);
19 role = elm_interface_atspi_accessible_role_get(hover); 19 role = efl_access_role_get(hover);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_POPUP_MENU); 21 ck_assert(role == EFL_ACCESS_ROLE_POPUP_MENU);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_hoversel.c b/src/tests/elementary/elm_test_hoversel.c
index 14f1148..8693b21 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *hoversel; 12 Evas_Object *win, *hoversel;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC);
17 17
18 hoversel = elm_hoversel_add(win); 18 hoversel = elm_hoversel_add(win);
19 role = elm_interface_atspi_accessible_role_get(hoversel); 19 role = efl_access_role_get(hoversel);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_PUSH_BUTTON); 21 ck_assert(role == EFL_ACCESS_ROLE_PUSH_BUTTON);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_icon.c b/src/tests/elementary/elm_test_icon.c
index 7cc9469..46f830c 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *icon; 12 Evas_Object *win, *icon;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
17 17
18 icon = elm_icon_add(win); 18 icon = elm_icon_add(win);
19 role = elm_interface_atspi_accessible_role_get(icon); 19 role = efl_access_role_get(icon);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_IMAGE); 21 ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c
index 290c23d..5953f2c 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -20,15 +20,15 @@ struct _Test_Data
20START_TEST (elm_atspi_role_get) 20START_TEST (elm_atspi_role_get)
21{ 21{
22 Evas_Object *win, *image; 22 Evas_Object *win, *image;
23 Elm_Atspi_Role role; 23 Efl_Access_Role role;
24 24
25 elm_init(1, NULL); 25 elm_init(1, NULL);
26 win = elm_win_add(NULL, "image", ELM_WIN_BASIC); 26 win = elm_win_add(NULL, "image", ELM_WIN_BASIC);
27 27
28 image = elm_image_add(win); 28 image = elm_image_add(win);
29 role = elm_interface_atspi_accessible_role_get(image); 29 role = efl_access_role_get(image);
30 30
31 ck_assert(role == ELM_ATSPI_ROLE_IMAGE); 31 ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
32 32
33 elm_shutdown(); 33 elm_shutdown();
34} 34}
diff --git a/src/tests/elementary/elm_test_index.c b/src/tests/elementary/elm_test_index.c
index 1a34933..7c4e7b5 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *idx; 12 Evas_Object *win, *idx;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "index", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "index", ELM_WIN_BASIC);
17 17
18 idx = elm_index_add(win); 18 idx = elm_index_add(win);
19 role = elm_interface_atspi_accessible_role_get(idx); 19 role = efl_access_role_get(idx);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_SCROLL_BAR); 21 ck_assert(role == EFL_ACCESS_ROLE_SCROLL_BAR);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_inwin.c b/src/tests/elementary/elm_test_inwin.c
index 942945d..1e9fdad 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *inwin; 12 Evas_Object *win, *inwin;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
17 17
18 inwin = elm_win_inwin_add(win); 18 inwin = elm_win_inwin_add(win);
19 role = elm_interface_atspi_accessible_role_get(inwin); 19 role = efl_access_role_get(inwin);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_GLASS_PANE); 21 ck_assert(role == EFL_ACCESS_ROLE_GLASS_PANE);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_label.c b/src/tests/elementary/elm_test_label.c
index a81fdf4..1518ac0 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *label; 12 Evas_Object *win, *label;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "label", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "label", ELM_WIN_BASIC);
17 17
18 label = elm_label_add(win); 18 label = elm_label_add(win);
19 role = elm_interface_atspi_accessible_role_get(label); 19 role = efl_access_role_get(label);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_LABEL); 21 ck_assert(role == EFL_ACCESS_ROLE_LABEL);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c
index 52e5dbe..779b0ad 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST(elm_atspi_role_get) 10START_TEST(elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *layout; 12 Evas_Object *win, *layout;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC);
17 17
18 layout = elm_layout_add(win); 18 layout = elm_layout_add(win);
19 role = elm_interface_atspi_accessible_role_get(layout); 19 role = efl_access_role_get(layout);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_FILLER); 21 ck_assert(role == EFL_ACCESS_ROLE_FILLER);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_list.c b/src/tests/elementary/elm_test_list.c
index 3b3a8bf..8346bc5 100644
--- a/src/tests/elementary/elm_test_list.c
+++ b/src/tests/elementary/elm_test_list.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4 4
5#define EFL_ACCESS_SELECTION_PROTECTED 5#define EFL_ACCESS_SELECTION_PROTECTED
6#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 6#define EFL_ACCESS_PROTECTED
7#include <Elementary.h> 7#include <Elementary.h>
8#include "elm_suite.h" 8#include "elm_suite.h"
9 9
@@ -186,15 +186,15 @@ END_TEST
186START_TEST (elm_atspi_role_get) 186START_TEST (elm_atspi_role_get)
187{ 187{
188 Evas_Object *win, *list; 188 Evas_Object *win, *list;
189 Elm_Atspi_Role role; 189 Efl_Access_Role role;
190 190
191 elm_init(1, NULL); 191 elm_init(1, NULL);
192 win = elm_win_add(NULL, "list", ELM_WIN_BASIC); 192 win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
193 193
194 list = elm_list_add(win); 194 list = elm_list_add(win);
195 role = elm_interface_atspi_accessible_role_get(list); 195 role = efl_access_role_get(list);
196 196
197 ck_assert(role == ELM_ATSPI_ROLE_LIST); 197 ck_assert(role == EFL_ACCESS_ROLE_LIST);
198 198
199 elm_shutdown(); 199 elm_shutdown();
200} 200}
@@ -207,7 +207,7 @@ END_TEST
207 */ 207 */
208START_TEST(elm_atspi_children_parent) 208START_TEST(elm_atspi_children_parent)
209{ 209{
210 Elm_Interface_Atspi_Accessible *parent; 210 Efl_Access *parent;
211 211
212 elm_init(1, NULL); 212 elm_init(1, NULL);
213 Evas_Object *win = elm_win_add(NULL, "list", ELM_WIN_BASIC); 213 Evas_Object *win = elm_win_add(NULL, "list", ELM_WIN_BASIC);
@@ -220,10 +220,10 @@ START_TEST(elm_atspi_children_parent)
220 220
221 evas_object_show(list); 221 evas_object_show(list);
222 222
223 parent = elm_interface_atspi_accessible_parent_get(icon); 223 parent = efl_access_parent_get(icon);
224 ck_assert(list == parent); 224 ck_assert(list == parent);
225 225
226 parent = elm_interface_atspi_accessible_parent_get(end); 226 parent = efl_access_parent_get(end);
227 ck_assert(list == parent); 227 ck_assert(list == parent);
228 228
229 elm_shutdown(); 229 elm_shutdown();
diff --git a/src/tests/elementary/elm_test_map.c b/src/tests/elementary/elm_test_map.c
index efaaa8f..d054653 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *map; 12 Evas_Object *win, *map;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "map", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "map", ELM_WIN_BASIC);
17 17
18 map = elm_map_add(win); 18 map = elm_map_add(win);
19 role = elm_interface_atspi_accessible_role_get(map); 19 role = efl_access_role_get(map);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_IMAGE_MAP); 21 ck_assert(role == EFL_ACCESS_ROLE_IMAGE_MAP);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_mapbuf.c b/src/tests/elementary/elm_test_mapbuf.c
index 570d37f..8a496e3 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *mapbuf; 12 Evas_Object *win, *mapbuf;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC);
17 17
18 mapbuf = elm_mapbuf_add(win); 18 mapbuf = elm_mapbuf_add(win);
19 role = elm_interface_atspi_accessible_role_get(mapbuf); 19 role = efl_access_role_get(mapbuf);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_IMAGE_MAP); 21 ck_assert(role == EFL_ACCESS_ROLE_IMAGE_MAP);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_menu.c b/src/tests/elementary/elm_test_menu.c
index 015bc89..d2fe253 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *menu; 12 Evas_Object *win, *menu;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "menu", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "menu", ELM_WIN_BASIC);
17 17
18 menu = elm_menu_add(win); 18 menu = elm_menu_add(win);
19 role = elm_interface_atspi_accessible_role_get(menu); 19 role = efl_access_role_get(menu);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_MENU); 21 ck_assert(role == EFL_ACCESS_ROLE_MENU);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_multibuttonentry.c b/src/tests/elementary/elm_test_multibuttonentry.c
index f476c25..3252507 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *multibuttonentry; 12 Evas_Object *win, *multibuttonentry;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "multibuttonentry", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "multibuttonentry", ELM_WIN_BASIC);
17 17
18 multibuttonentry = elm_multibuttonentry_add(win); 18 multibuttonentry = elm_multibuttonentry_add(win);
19 role = elm_interface_atspi_accessible_role_get(multibuttonentry); 19 role = efl_access_role_get(multibuttonentry);
20 20
21 ck_assert_int_eq(role, ELM_ATSPI_ROLE_PANEL); 21 ck_assert_int_eq(role, EFL_ACCESS_ROLE_PANEL);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_naviframe.c b/src/tests/elementary/elm_test_naviframe.c
index a34ce3e..249dfdc 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *naviframe; 12 Evas_Object *win, *naviframe;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC);
17 17
18 naviframe = elm_naviframe_add(win); 18 naviframe = elm_naviframe_add(win);
19 role = elm_interface_atspi_accessible_role_get(naviframe); 19 role = efl_access_role_get(naviframe);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_PAGE_TAB_LIST); 21 ck_assert(role == EFL_ACCESS_ROLE_PAGE_TAB_LIST);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_notify.c b/src/tests/elementary/elm_test_notify.c
index 9fe99cf..56be4c7 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *notify; 12 Evas_Object *win, *notify;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "notify", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "notify", ELM_WIN_BASIC);
17 17
18 notify = elm_notify_add(win); 18 notify = elm_notify_add(win);
19 role = elm_interface_atspi_accessible_role_get(notify); 19 role = efl_access_role_get(notify);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_NOTIFICATION); 21 ck_assert(role == EFL_ACCESS_ROLE_NOTIFICATION);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_panel.c b/src/tests/elementary/elm_test_panel.c
index e98792e..81ea083 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *panel; 12 Evas_Object *win, *panel;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "panel", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "panel", ELM_WIN_BASIC);
17 17
18 panel = elm_panel_add(win); 18 panel = elm_panel_add(win);
19 role = elm_interface_atspi_accessible_role_get(panel); 19 role = efl_access_role_get(panel);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_PANEL); 21 ck_assert(role == EFL_ACCESS_ROLE_PANEL);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_panes.c b/src/tests/elementary/elm_test_panes.c
index fea0a02..cf66ae5 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *panes; 12 Evas_Object *win, *panes;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "panes", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "panes", ELM_WIN_BASIC);
17 17
18 panes = elm_panes_add(win); 18 panes = elm_panes_add(win);
19 role = elm_interface_atspi_accessible_role_get(panes); 19 role = efl_access_role_get(panes);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_SPLIT_PANE); 21 ck_assert(role == EFL_ACCESS_ROLE_SPLIT_PANE);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_photo.c b/src/tests/elementary/elm_test_photo.c
index 3d8bc5f..5ddbc64 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *photo; 12 Evas_Object *win, *photo;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "photo", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "photo", ELM_WIN_BASIC);
17 17
18 photo = elm_photo_add(win); 18 photo = elm_photo_add(win);
19 role = elm_interface_atspi_accessible_role_get(photo); 19 role = efl_access_role_get(photo);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_IMAGE); 21 ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_photocam.c b/src/tests/elementary/elm_test_photocam.c
index 8d9cff1..34122723 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *photocam; 12 Evas_Object *win, *photocam;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC);
17 17
18 photocam = elm_photocam_add(win); 18 photocam = elm_photocam_add(win);
19 role = elm_interface_atspi_accessible_role_get(photocam); 19 role = efl_access_role_get(photocam);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_IMAGE); 21 ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_player.c b/src/tests/elementary/elm_test_player.c
index 863bfba..a2b22c5 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *player; 12 Evas_Object *win, *player;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "player", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "player", ELM_WIN_BASIC);
17 17
18 player = elm_player_add(win); 18 player = elm_player_add(win);
19 role = elm_interface_atspi_accessible_role_get(player); 19 role = efl_access_role_get(player);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_ANIMATION); 21 ck_assert(role == EFL_ACCESS_ROLE_ANIMATION);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_plug.c b/src/tests/elementary/elm_test_plug.c
index 8139ae5..6db1190 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *plug; 12 Evas_Object *win, *plug;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "plug", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "plug", ELM_WIN_BASIC);
17 17
18 plug = elm_plug_add(win); 18 plug = elm_plug_add(win);
19 role = elm_interface_atspi_accessible_role_get(plug); 19 role = efl_access_role_get(plug);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_IMAGE); 21 ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_popup.c b/src/tests/elementary/elm_test_popup.c
index b284475..abeb4fc 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *popup; 12 Evas_Object *win, *popup;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "popup", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "popup", ELM_WIN_BASIC);
17 17
18 popup = elm_popup_add(win); 18 popup = elm_popup_add(win);
19 role = elm_interface_atspi_accessible_role_get(popup); 19 role = efl_access_role_get(popup);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_NOTIFICATION); 21 ck_assert(role == EFL_ACCESS_ROLE_NOTIFICATION);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_prefs.c b/src/tests/elementary/elm_test_prefs.c
index 091e697..e1f753d 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -11,15 +11,15 @@ START_TEST (elm_atspi_role_get)
11{ 11{
12#if 0 12#if 0
13 Evas_Object *win, *prefs; 13 Evas_Object *win, *prefs;
14 Elm_Atspi_Role role; 14 Efl_Access_Role role;
15 15
16 elm_init(1, NULL); 16 elm_init(1, NULL);
17 win = elm_win_add(NULL, "prefs", ELM_WIN_BASIC); 17 win = elm_win_add(NULL, "prefs", ELM_WIN_BASIC);
18 18
19 prefs = elm_prefs_add(win); 19 prefs = elm_prefs_add(win);
20 role = elm_interface_atspi_accessible_role_get(prefs); 20 role = efl_access_role_get(prefs);
21 21
22 ck_assert(role == ELM_ATSPI_ROLE_REDUNDANT_OBJECT); 22 ck_assert(role == EFL_ACCESS_ROLE_REDUNDANT_OBJECT);
23 23
24 elm_shutdown(); 24 elm_shutdown();
25#endif 25#endif
diff --git a/src/tests/elementary/elm_test_progressbar.c b/src/tests/elementary/elm_test_progressbar.c
index 53319d7..5e76b6c 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *progressbar; 12 Evas_Object *win, *progressbar;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC);
17 17
18 progressbar = elm_progressbar_add(win); 18 progressbar = elm_progressbar_add(win);
19 role = elm_interface_atspi_accessible_role_get(progressbar); 19 role = efl_access_role_get(progressbar);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_PROGRESS_BAR); 21 ck_assert(role == EFL_ACCESS_ROLE_PROGRESS_BAR);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_radio.c b/src/tests/elementary/elm_test_radio.c
index 874dbe7..bce91e6 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *radio; 12 Evas_Object *win, *radio;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "radio", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "radio", ELM_WIN_BASIC);
17 17
18 radio = elm_radio_add(win); 18 radio = elm_radio_add(win);
19 role = elm_interface_atspi_accessible_role_get(radio); 19 role = efl_access_role_get(radio);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_RADIO_BUTTON); 21 ck_assert(role == EFL_ACCESS_ROLE_RADIO_BUTTON);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_scroller.c b/src/tests/elementary/elm_test_scroller.c
index 537710f..5996e86 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *scroller; 12 Evas_Object *win, *scroller;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC);
17 17
18 scroller = elm_scroller_add(win); 18 scroller = elm_scroller_add(win);
19 role = elm_interface_atspi_accessible_role_get(scroller); 19 role = efl_access_role_get(scroller);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_SCROLL_PANE); 21 ck_assert(role == EFL_ACCESS_ROLE_SCROLL_PANE);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_segmentcontrol.c b/src/tests/elementary/elm_test_segmentcontrol.c
index 31812e6..c4de3c8 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *segmentcontrol; 12 Evas_Object *win, *segmentcontrol;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "segmentcontrol", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "segmentcontrol", ELM_WIN_BASIC);
17 17
18 segmentcontrol = elm_segment_control_add(win); 18 segmentcontrol = elm_segment_control_add(win);
19 role = elm_interface_atspi_accessible_role_get(segmentcontrol); 19 role = efl_access_role_get(segmentcontrol);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_LIST); 21 ck_assert(role == EFL_ACCESS_ROLE_LIST);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_separator.c b/src/tests/elementary/elm_test_separator.c
index a786cd3..2f24da6 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *separator; 12 Evas_Object *win, *separator;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "icon", ELM_WIN_BASIC);
17 17
18 separator = elm_separator_add(win); 18 separator = elm_separator_add(win);
19 role = elm_interface_atspi_accessible_role_get(separator); 19 role = efl_access_role_get(separator);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_SEPARATOR); 21 ck_assert(role == EFL_ACCESS_ROLE_SEPARATOR);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_slider.c b/src/tests/elementary/elm_test_slider.c
index 59e359d..75f08ea 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *slider; 12 Evas_Object *win, *slider;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "slider", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "slider", ELM_WIN_BASIC);
17 17
18 slider = elm_slider_add(win); 18 slider = elm_slider_add(win);
19 role = elm_interface_atspi_accessible_role_get(slider); 19 role = efl_access_role_get(slider);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_SLIDER); 21 ck_assert(role == EFL_ACCESS_ROLE_SLIDER);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_slideshow.c b/src/tests/elementary/elm_test_slideshow.c
index 8edacc5..5764ccd 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *slideshow; 12 Evas_Object *win, *slideshow;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC);
17 17
18 slideshow = elm_slideshow_add(win); 18 slideshow = elm_slideshow_add(win);
19 role = elm_interface_atspi_accessible_role_get(slideshow); 19 role = efl_access_role_get(slideshow);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_DOCUMENT_PRESENTATION); 21 ck_assert(role == EFL_ACCESS_ROLE_DOCUMENT_PRESENTATION);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_spinner.c b/src/tests/elementary/elm_test_spinner.c
index bc77c97..d995653 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *spinner; 12 Evas_Object *win, *spinner;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC);
17 17
18 spinner = elm_spinner_add(win); 18 spinner = elm_spinner_add(win);
19 role = elm_interface_atspi_accessible_role_get(spinner); 19 role = efl_access_role_get(spinner);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_SPIN_BUTTON); 21 ck_assert(role == EFL_ACCESS_ROLE_SPIN_BUTTON);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_table.c b/src/tests/elementary/elm_test_table.c
index bb7edc5..7fa9323 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *table; 12 Evas_Object *win, *table;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "table", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "table", ELM_WIN_BASIC);
17 17
18 table = elm_table_add(win); 18 table = elm_table_add(win);
19 role = elm_interface_atspi_accessible_role_get(table); 19 role = efl_access_role_get(table);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_FILLER); 21 ck_assert(role == EFL_ACCESS_ROLE_FILLER);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_thumb.c b/src/tests/elementary/elm_test_thumb.c
index 3a06b0c..895a5f8 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *thumb; 12 Evas_Object *win, *thumb;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC);
17 17
18 thumb = elm_thumb_add(win); 18 thumb = elm_thumb_add(win);
19 role = elm_interface_atspi_accessible_role_get(thumb); 19 role = efl_access_role_get(thumb);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_IMAGE); 21 ck_assert(role == EFL_ACCESS_ROLE_IMAGE);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_toolbar.c b/src/tests/elementary/elm_test_toolbar.c
index d50f50b..b1136f6 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *toolbar; 12 Evas_Object *win, *toolbar;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC);
17 17
18 toolbar = elm_toolbar_add(win); 18 toolbar = elm_toolbar_add(win);
19 role = elm_interface_atspi_accessible_role_get(toolbar); 19 role = efl_access_role_get(toolbar);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_TOOL_BAR); 21 ck_assert(role == EFL_ACCESS_ROLE_TOOL_BAR);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_video.c b/src/tests/elementary/elm_test_video.c
index f3b7fea..444af9d 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -10,15 +10,15 @@
10START_TEST (elm_atspi_role_get) 10START_TEST (elm_atspi_role_get)
11{ 11{
12 Evas_Object *win, *video; 12 Evas_Object *win, *video;
13 Elm_Atspi_Role role; 13 Efl_Access_Role role;
14 14
15 elm_init(1, NULL); 15 elm_init(1, NULL);
16 win = elm_win_add(NULL, "video", ELM_WIN_BASIC); 16 win = elm_win_add(NULL, "video", ELM_WIN_BASIC);
17 17
18 video = elm_video_add(win); 18 video = elm_video_add(win);
19 role = elm_interface_atspi_accessible_role_get(video); 19 role = efl_access_role_get(video);
20 20
21 ck_assert(role == ELM_ATSPI_ROLE_ANIMATION); 21 ck_assert(role == EFL_ACCESS_ROLE_ANIMATION);
22 22
23 elm_shutdown(); 23 elm_shutdown();
24} 24}
diff --git a/src/tests/elementary/elm_test_web.c b/src/tests/elementary/elm_test_web.c
index e986e8c..b094376 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#include <Elementary.h> 6#include <Elementary.h>
7#include "elm_suite.h" 7#include "elm_suite.h"
8 8
@@ -11,15 +11,15 @@ START_TEST (elm_atspi_role_get)
11{ 11{
12#if 0 12#if 0
13 Evas_Object *win, *web; 13 Evas_Object *win, *web;
14 Elm_Atspi_Role role; 14 Efl_Access_Role role;
15 15
16 elm_init(1, NULL); 16 elm_init(1, NULL);
17 win = elm_win_add(NULL, "web", ELM_WIN_BASIC); 17 win = elm_win_add(NULL, "web", ELM_WIN_BASIC);
18 18
19 web = elm_web_add(win); 19 web = elm_web_add(win);
20 role = elm_interface_atspi_accessible_role_get(web); 20 role = efl_access_role_get(web);
21 21
22 ck_assert(role == ELM_ATSPI_ROLE_HTML_CONTAINER); 22 ck_assert(role == EFL_ACCESS_ROLE_HTML_CONTAINER);
23 23
24 elm_shutdown(); 24 elm_shutdown();
25#endif 25#endif
diff --git a/src/tests/elementary/elm_test_win.c b/src/tests/elementary/elm_test_win.c
index b8524b3..4585564 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 ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define EFL_ACCESS_PROTECTED
6#define EFL_ACCESS_COMPONENT_PROTECTED 6#define EFL_ACCESS_COMPONENT_PROTECTED
7#include <Elementary.h> 7#include <Elementary.h>
8#ifdef HAVE_ELEMENTARY_X 8#ifdef HAVE_ELEMENTARY_X
@@ -64,14 +64,14 @@ _timer_fail_flag_cb(void *data)
64START_TEST (elm_atspi_role_get) 64START_TEST (elm_atspi_role_get)
65{ 65{
66 Evas_Object *win; 66 Evas_Object *win;
67 Elm_Atspi_Role role; 67 Efl_Access_Role role;
68 68
69 elm_init(1, NULL); 69 elm_init(1, NULL);
70 win = elm_win_add(NULL, "win", ELM_WIN_BASIC); 70 win = elm_win_add(NULL, "win", ELM_WIN_BASIC);
71 71
72 role = elm_interface_atspi_accessible_role_get(win); 72 role = efl_access_role_get(win);
73 73
74 ck_assert(role == ELM_ATSPI_ROLE_WINDOW); 74 ck_assert(role == EFL_ACCESS_ROLE_WINDOW);
75 75
76 elm_shutdown(); 76 elm_shutdown();
77} 77}