summaryrefslogtreecommitdiff
path: root/src/tests/elementary
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-04-27 14:59:04 +0200
committerStefan Schmidt <stefan@osg.samsung.com>2018-04-27 15:01:39 +0200
commit0cf63649c70a62c5035e5b743eac5d17034ef5b9 (patch)
treee7b6b6977a29718508ae772c23d1fe3880445e9a /src/tests/elementary
parent18b6b1248d79627982390dbd3d2b11ce2e7f238e (diff)
tests: use a global win object in fork mode when using buffer engine
Summary: this avoids the creation of a new win object for each test ref T6864 Reviewers: stefan_schmidt, cedric Reviewed By: cedric Subscribers: cedric Maniphest Tasks: T6864 Differential Revision: https://phab.enlightenment.org/D5965
Diffstat (limited to 'src/tests/elementary')
-rw-r--r--src/tests/elementary/elm_code_test_syntax.c2
-rw-r--r--src/tests/elementary/elm_code_test_widget.c6
-rw-r--r--src/tests/elementary/elm_code_test_widget_selection.c36
-rw-r--r--src/tests/elementary/elm_code_test_widget_text.c4
-rw-r--r--src/tests/elementary/elm_code_test_widget_undo.c4
-rw-r--r--src/tests/elementary/elm_suite.c18
-rw-r--r--src/tests/elementary/elm_suite.h4
-rw-r--r--src/tests/elementary/elm_test_actionslider.c4
-rw-r--r--src/tests/elementary/elm_test_atspi.c8
-rw-r--r--src/tests/elementary/elm_test_bg.c4
-rw-r--r--src/tests/elementary/elm_test_box.c4
-rw-r--r--src/tests/elementary/elm_test_bubble.c4
-rw-r--r--src/tests/elementary/elm_test_button.c6
-rw-r--r--src/tests/elementary/elm_test_calendar.c4
-rw-r--r--src/tests/elementary/elm_test_check.c8
-rw-r--r--src/tests/elementary/elm_test_clock.c4
-rw-r--r--src/tests/elementary/elm_test_colorselector.c6
-rw-r--r--src/tests/elementary/elm_test_conformant.c4
-rw-r--r--src/tests/elementary/elm_test_ctxpopup.c4
-rw-r--r--src/tests/elementary/elm_test_datetime.c4
-rw-r--r--src/tests/elementary/elm_test_dayselector.c4
-rw-r--r--src/tests/elementary/elm_test_diskselector.c4
-rw-r--r--src/tests/elementary/elm_test_entry.c24
-rw-r--r--src/tests/elementary/elm_test_fileselector.c6
-rw-r--r--src/tests/elementary/elm_test_fileselector_button.c4
-rw-r--r--src/tests/elementary/elm_test_fileselector_entry.c4
-rw-r--r--src/tests/elementary/elm_test_flip.c4
-rw-r--r--src/tests/elementary/elm_test_flipselector.c4
-rw-r--r--src/tests/elementary/elm_test_frame.c4
-rw-r--r--src/tests/elementary/elm_test_gengrid.c6
-rw-r--r--src/tests/elementary/elm_test_genlist.c8
-rw-r--r--src/tests/elementary/elm_test_glview.c4
-rw-r--r--src/tests/elementary/elm_test_grid.c4
-rw-r--r--src/tests/elementary/elm_test_hover.c4
-rw-r--r--src/tests/elementary/elm_test_hoversel.c4
-rw-r--r--src/tests/elementary/elm_test_icon.c4
-rw-r--r--src/tests/elementary/elm_test_image.c10
-rw-r--r--src/tests/elementary/elm_test_index.c4
-rw-r--r--src/tests/elementary/elm_test_inwin.c4
-rw-r--r--src/tests/elementary/elm_test_label.c4
-rw-r--r--src/tests/elementary/elm_test_layout.c8
-rw-r--r--src/tests/elementary/elm_test_list.c20
-rw-r--r--src/tests/elementary/elm_test_map.c4
-rw-r--r--src/tests/elementary/elm_test_mapbuf.c4
-rw-r--r--src/tests/elementary/elm_test_menu.c4
-rw-r--r--src/tests/elementary/elm_test_multibuttonentry.c4
-rw-r--r--src/tests/elementary/elm_test_naviframe.c4
-rw-r--r--src/tests/elementary/elm_test_notify.c4
-rw-r--r--src/tests/elementary/elm_test_panel.c4
-rw-r--r--src/tests/elementary/elm_test_panes.c4
-rw-r--r--src/tests/elementary/elm_test_photo.c4
-rw-r--r--src/tests/elementary/elm_test_photocam.c6
-rw-r--r--src/tests/elementary/elm_test_player.c4
-rw-r--r--src/tests/elementary/elm_test_plug.c4
-rw-r--r--src/tests/elementary/elm_test_popup.c4
-rw-r--r--src/tests/elementary/elm_test_prefs.c4
-rw-r--r--src/tests/elementary/elm_test_progressbar.c4
-rw-r--r--src/tests/elementary/elm_test_radio.c4
-rw-r--r--src/tests/elementary/elm_test_scroller.c4
-rw-r--r--src/tests/elementary/elm_test_segmentcontrol.c4
-rw-r--r--src/tests/elementary/elm_test_separator.c4
-rw-r--r--src/tests/elementary/elm_test_slider.c4
-rw-r--r--src/tests/elementary/elm_test_slideshow.c4
-rw-r--r--src/tests/elementary/elm_test_spinner.c4
-rw-r--r--src/tests/elementary/elm_test_table.c4
-rw-r--r--src/tests/elementary/elm_test_thumb.c4
-rw-r--r--src/tests/elementary/elm_test_toolbar.c4
-rw-r--r--src/tests/elementary/elm_test_video.c4
-rw-r--r--src/tests/elementary/elm_test_web.c4
-rw-r--r--src/tests/elementary/elm_test_win.c14
70 files changed, 212 insertions, 192 deletions
diff --git a/src/tests/elementary/elm_code_test_syntax.c b/src/tests/elementary/elm_code_test_syntax.c
index 8808009..2af474c 100644
--- a/src/tests/elementary/elm_code_test_syntax.c
+++ b/src/tests/elementary/elm_code_test_syntax.c
@@ -62,7 +62,7 @@ EFL_START_TEST (elm_code_syntax_c)
62 code = elm_code_create(); 62 code = elm_code_create();
63 file = elm_code_file_new(code); 63 file = elm_code_file_new(code);
64 64
65 win = elm_win_add(NULL, "syntax", ELM_WIN_BASIC); 65 win = win_add(NULL, "syntax", ELM_WIN_BASIC);
66 widget = elm_code_widget_add(win, code); 66 widget = elm_code_widget_add(win, code);
67 elm_obj_code_widget_code_get(widget)->file->mime = "text/x-csrc"; 67 elm_obj_code_widget_code_get(widget)->file->mime = "text/x-csrc";
68 elm_code_widget_syntax_enabled_set(widget, EINA_TRUE); 68 elm_code_widget_syntax_enabled_set(widget, EINA_TRUE);
diff --git a/src/tests/elementary/elm_code_test_widget.c b/src/tests/elementary/elm_code_test_widget.c
index 10ef6cd..e510368 100644
--- a/src/tests/elementary/elm_code_test_widget.c
+++ b/src/tests/elementary/elm_code_test_widget.c
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_code_widget_construct)
34 elm_init(1, args); 34 elm_init(1, args);
35 code = elm_code_create(); 35 code = elm_code_create();
36 36
37 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 37 win = win_add(NULL, "entry", ELM_WIN_BASIC);
38 widget = elm_code_widget_add(win, code); 38 widget = elm_code_widget_add(win, code);
39 39
40 ck_assert(!!widget); 40 ck_assert(!!widget);
@@ -51,7 +51,7 @@ EFL_START_TEST (elm_code_widget_construct_nocode)
51 char *args[] = { "exe" }; 51 char *args[] = { "exe" };
52 elm_init(1, args); 52 elm_init(1, args);
53 53
54 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 54 win = win_add(NULL, "entry", ELM_WIN_BASIC);
55 widget = elm_code_widget_add(win, NULL); 55 widget = elm_code_widget_add(win, NULL);
56 ck_assert(!widget); 56 ck_assert(!widget);
57 57
@@ -70,7 +70,7 @@ EFL_START_TEST (elm_code_widget_position)
70 elm_init(1, args); 70 elm_init(1, args);
71 code = elm_code_create(); 71 code = elm_code_create();
72 72
73 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 73 win = win_add(NULL, "entry", ELM_WIN_BASIC);
74 widget = elm_code_widget_add(win, code); 74 widget = elm_code_widget_add(win, code);
75 evas_object_show(widget); 75 evas_object_show(widget);
76 evas_object_resize(widget, 100, 100); 76 evas_object_resize(widget, 100, 100);
diff --git a/src/tests/elementary/elm_code_test_widget_selection.c b/src/tests/elementary/elm_code_test_widget_selection.c
index b5d5897..8ad7611 100644
--- a/src/tests/elementary/elm_code_test_widget_selection.c
+++ b/src/tests/elementary/elm_code_test_widget_selection.c
@@ -22,7 +22,7 @@ EFL_START_TEST (elm_code_test_widget_selection_set)
22 file = elm_code_file_new(code); 22 file = elm_code_file_new(code);
23 elm_code_file_line_append(file, "test", 4, NULL); 23 elm_code_file_line_append(file, "test", 4, NULL);
24 24
25 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 25 win = win_add(NULL, "entry", ELM_WIN_BASIC);
26 widget = elm_code_widget_add(win, code); 26 widget = elm_code_widget_add(win, code);
27 27
28 elm_code_widget_selection_start(widget, 1, 2); 28 elm_code_widget_selection_start(widget, 1, 2);
@@ -48,7 +48,7 @@ EFL_START_TEST (elm_code_test_widget_selection_normalized_get)
48 file = elm_code_file_new(code); 48 file = elm_code_file_new(code);
49 elm_code_file_line_append(file, "test", 4, NULL); 49 elm_code_file_line_append(file, "test", 4, NULL);
50 50
51 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 51 win = win_add(NULL, "entry", ELM_WIN_BASIC);
52 widget = elm_code_widget_add(win, code); 52 widget = elm_code_widget_add(win, code);
53 53
54 elm_code_widget_selection_start(widget, 1, 3); 54 elm_code_widget_selection_start(widget, 1, 3);
@@ -91,7 +91,7 @@ EFL_START_TEST (elm_code_test_widget_selection_text_get)
91 file = elm_code_file_new(code); 91 file = elm_code_file_new(code);
92 elm_code_file_line_append(file, "test", 4, NULL); 92 elm_code_file_line_append(file, "test", 4, NULL);
93 93
94 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 94 win = win_add(NULL, "entry", ELM_WIN_BASIC);
95 widget = elm_code_widget_add(win, code); 95 widget = elm_code_widget_add(win, code);
96 96
97 ck_assert_str_eq("", elm_code_widget_selection_text_get(widget)); 97 ck_assert_str_eq("", elm_code_widget_selection_text_get(widget));
@@ -125,7 +125,7 @@ EFL_START_TEST (elm_code_test_widget_selection_reverse_text_get)
125 file = elm_code_file_new(code); 125 file = elm_code_file_new(code);
126 elm_code_file_line_append(file, "test", 4, NULL); 126 elm_code_file_line_append(file, "test", 4, NULL);
127 127
128 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 128 win = win_add(NULL, "entry", ELM_WIN_BASIC);
129 widget = elm_code_widget_add(win, code); 129 widget = elm_code_widget_add(win, code);
130 130
131 ck_assert_str_eq("", elm_code_widget_selection_text_get(widget)); 131 ck_assert_str_eq("", elm_code_widget_selection_text_get(widget));
@@ -160,7 +160,7 @@ EFL_START_TEST (elm_code_test_widget_selection_text_get_twoline)
160 elm_code_file_line_append(file, "test", 4, NULL); 160 elm_code_file_line_append(file, "test", 4, NULL);
161 elm_code_file_line_append(file, "test", 4, NULL); 161 elm_code_file_line_append(file, "test", 4, NULL);
162 162
163 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 163 win = win_add(NULL, "entry", ELM_WIN_BASIC);
164 widget = elm_code_widget_add(win, code); 164 widget = elm_code_widget_add(win, code);
165 165
166 elm_code_widget_selection_start(widget, 1, 3); 166 elm_code_widget_selection_start(widget, 1, 3);
@@ -190,7 +190,7 @@ EFL_START_TEST (elm_code_test_widget_selection_reverse_text_get_twoline)
190 elm_code_file_line_append(file, "test", 4, NULL); 190 elm_code_file_line_append(file, "test", 4, NULL);
191 elm_code_file_line_append(file, "test", 4, NULL); 191 elm_code_file_line_append(file, "test", 4, NULL);
192 192
193 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 193 win = win_add(NULL, "entry", ELM_WIN_BASIC);
194 widget = elm_code_widget_add(win, code); 194 widget = elm_code_widget_add(win, code);
195 195
196 elm_code_widget_selection_start(widget, 2, 2); 196 elm_code_widget_selection_start(widget, 2, 2);
@@ -221,7 +221,7 @@ EFL_START_TEST (elm_code_test_widget_selection_text_get_multiline)
221 elm_code_file_line_append(file, "test", 4, NULL); 221 elm_code_file_line_append(file, "test", 4, NULL);
222 elm_code_file_line_append(file, "test", 4, NULL); 222 elm_code_file_line_append(file, "test", 4, NULL);
223 223
224 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 224 win = win_add(NULL, "entry", ELM_WIN_BASIC);
225 widget = elm_code_widget_add(win, code); 225 widget = elm_code_widget_add(win, code);
226 226
227 elm_code_widget_selection_start(widget, 1, 3); 227 elm_code_widget_selection_start(widget, 1, 3);
@@ -252,7 +252,7 @@ EFL_START_TEST (elm_code_test_widget_selection_reverse_text_get_multiline)
252 elm_code_file_line_append(file, "test", 4, NULL); 252 elm_code_file_line_append(file, "test", 4, NULL);
253 elm_code_file_line_append(file, "test", 4, NULL); 253 elm_code_file_line_append(file, "test", 4, NULL);
254 254
255 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 255 win = win_add(NULL, "entry", ELM_WIN_BASIC);
256 widget = elm_code_widget_add(win, code); 256 widget = elm_code_widget_add(win, code);
257 257
258 elm_code_widget_selection_start(widget, 3, 2); 258 elm_code_widget_selection_start(widget, 3, 2);
@@ -283,7 +283,7 @@ EFL_START_TEST (elm_code_test_widget_selection_delete)
283 file = elm_code_file_new(code); 283 file = elm_code_file_new(code);
284 elm_code_file_line_append(file, "text", 4, NULL); 284 elm_code_file_line_append(file, "text", 4, NULL);
285 285
286 win = elm_win_add(NULL, "code", ELM_WIN_BASIC); 286 win = win_add(NULL, "code", ELM_WIN_BASIC);
287 widget = elm_code_widget_add(win, code); 287 widget = elm_code_widget_add(win, code);
288 line = elm_code_file_line_get(file, 1); 288 line = elm_code_file_line_get(file, 1);
289 text = elm_code_line_text_get(line, &length); 289 text = elm_code_line_text_get(line, &length);
@@ -320,7 +320,7 @@ EFL_START_TEST (elm_code_test_widget_selection_reverse_delete)
320 file = elm_code_file_new(code); 320 file = elm_code_file_new(code);
321 elm_code_file_line_append(file, "text", 4, NULL); 321 elm_code_file_line_append(file, "text", 4, NULL);
322 322
323 win = elm_win_add(NULL, "code", ELM_WIN_BASIC); 323 win = win_add(NULL, "code", ELM_WIN_BASIC);
324 widget = elm_code_widget_add(win, code); 324 widget = elm_code_widget_add(win, code);
325 line = elm_code_file_line_get(file, 1); 325 line = elm_code_file_line_get(file, 1);
326 text = elm_code_line_text_get(line, &length); 326 text = elm_code_line_text_get(line, &length);
@@ -359,7 +359,7 @@ EFL_START_TEST (elm_code_test_widget_selection_delete_twoline)
359 elm_code_file_line_append(file, "TEXT", 4, NULL); 359 elm_code_file_line_append(file, "TEXT", 4, NULL);
360 elm_code_file_line_append(file, "remove", 6, NULL); 360 elm_code_file_line_append(file, "remove", 6, NULL);
361 361
362 win = elm_win_add(NULL, "code", ELM_WIN_BASIC); 362 win = win_add(NULL, "code", ELM_WIN_BASIC);
363 widget = elm_code_widget_add(win, code); 363 widget = elm_code_widget_add(win, code);
364 line = elm_code_file_line_get(file, 1); 364 line = elm_code_file_line_get(file, 1);
365 text = elm_code_line_text_get(line, NULL); 365 text = elm_code_line_text_get(line, NULL);
@@ -407,7 +407,7 @@ EFL_START_TEST (elm_code_test_widget_selection_reverse_delete_twoline)
407 elm_code_file_line_append(file, "TEXT", 4, NULL); 407 elm_code_file_line_append(file, "TEXT", 4, NULL);
408 elm_code_file_line_append(file, "remove", 6, NULL); 408 elm_code_file_line_append(file, "remove", 6, NULL);
409 409
410 win = elm_win_add(NULL, "code", ELM_WIN_BASIC); 410 win = win_add(NULL, "code", ELM_WIN_BASIC);
411 widget = elm_code_widget_add(win, code); 411 widget = elm_code_widget_add(win, code);
412 line = elm_code_file_line_get(file, 1); 412 line = elm_code_file_line_get(file, 1);
413 text = elm_code_line_text_get(line, NULL); 413 text = elm_code_line_text_get(line, NULL);
@@ -457,7 +457,7 @@ EFL_START_TEST (elm_code_test_widget_selection_delete_multiline)
457 elm_code_file_line_append(file, "delete", 6, NULL); 457 elm_code_file_line_append(file, "delete", 6, NULL);
458 elm_code_file_line_append(file, "REMOVE", 6, NULL); 458 elm_code_file_line_append(file, "REMOVE", 6, NULL);
459 459
460 win = elm_win_add(NULL, "code", ELM_WIN_BASIC); 460 win = win_add(NULL, "code", ELM_WIN_BASIC);
461 widget = elm_code_widget_add(win, code); 461 widget = elm_code_widget_add(win, code);
462 line = elm_code_file_line_get(file, 1); 462 line = elm_code_file_line_get(file, 1);
463 text = elm_code_line_text_get(line, NULL); 463 text = elm_code_line_text_get(line, NULL);
@@ -507,7 +507,7 @@ EFL_START_TEST (elm_code_test_widget_selection_reverse_delete_multiline)
507 elm_code_file_line_append(file, "delete", 6, NULL); 507 elm_code_file_line_append(file, "delete", 6, NULL);
508 elm_code_file_line_append(file, "REMOVE", 6, NULL); 508 elm_code_file_line_append(file, "REMOVE", 6, NULL);
509 509
510 win = elm_win_add(NULL, "code", ELM_WIN_BASIC); 510 win = win_add(NULL, "code", ELM_WIN_BASIC);
511 widget = elm_code_widget_add(win, code); 511 widget = elm_code_widget_add(win, code);
512 line = elm_code_file_line_get(file, 1); 512 line = elm_code_file_line_get(file, 1);
513 text = elm_code_line_text_get(line, NULL); 513 text = elm_code_line_text_get(line, NULL);
@@ -553,7 +553,7 @@ EFL_START_TEST (elm_code_test_widget_selection_select_line)
553 elm_code_file_line_append(file, "line2", 5, NULL); 553 elm_code_file_line_append(file, "line2", 5, NULL);
554 elm_code_file_line_append(file, "\ttab", 4, NULL); 554 elm_code_file_line_append(file, "\ttab", 4, NULL);
555 555
556 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 556 win = win_add(NULL, "entry", ELM_WIN_BASIC);
557 widget = elm_code_widget_add(win, code); 557 widget = elm_code_widget_add(win, code);
558 558
559 elm_code_widget_selection_select_line(widget, 1); 559 elm_code_widget_selection_select_line(widget, 1);
@@ -591,7 +591,7 @@ EFL_START_TEST (elm_code_test_widget_selection_select_word)
591 elm_code_file_line_append(file, "more stuff\tto test", 18, NULL); 591 elm_code_file_line_append(file, "more stuff\tto test", 18, NULL);
592 elm_code_file_line_append(file, "word \"symbols\" test", 19, NULL); 592 elm_code_file_line_append(file, "word \"symbols\" test", 19, NULL);
593 593
594 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 594 win = win_add(NULL, "entry", ELM_WIN_BASIC);
595 widget = elm_code_widget_add(win, code); 595 widget = elm_code_widget_add(win, code);
596 596
597 elm_code_widget_selection_select_word(widget, 1, 3); 597 elm_code_widget_selection_select_word(widget, 1, 3);
@@ -631,7 +631,7 @@ EFL_START_TEST (elm_code_test_widget_selection_select_word_punctuation)
631 file = elm_code_file_new(code); 631 file = elm_code_file_new(code);
632 elm_code_file_line_append(file, "comma, stop. question? mark!", 38, NULL); 632 elm_code_file_line_append(file, "comma, stop. question? mark!", 38, NULL);
633 633
634 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 634 win = win_add(NULL, "entry", ELM_WIN_BASIC);
635 widget = elm_code_widget_add(win, code); 635 widget = elm_code_widget_add(win, code);
636 636
637 elm_code_widget_selection_select_word(widget, 1, 3); 637 elm_code_widget_selection_select_word(widget, 1, 3);
@@ -671,7 +671,7 @@ EFL_START_TEST (elm_code_test_widget_selection_select_word_symbols)
671 file = elm_code_file_new(code); 671 file = elm_code_file_new(code);
672 elm_code_file_line_append(file, "colon: [array] (brackets) {braces}", 38, NULL); 672 elm_code_file_line_append(file, "colon: [array] (brackets) {braces}", 38, NULL);
673 673
674 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 674 win = win_add(NULL, "entry", ELM_WIN_BASIC);
675 widget = elm_code_widget_add(win, code); 675 widget = elm_code_widget_add(win, code);
676 676
677 elm_code_widget_selection_select_word(widget, 1, 3); 677 elm_code_widget_selection_select_word(widget, 1, 3);
diff --git a/src/tests/elementary/elm_code_test_widget_text.c b/src/tests/elementary/elm_code_test_widget_text.c
index 1e6a3b5..e9eff3c 100644
--- a/src/tests/elementary/elm_code_test_widget_text.c
+++ b/src/tests/elementary/elm_code_test_widget_text.c
@@ -16,7 +16,7 @@ EFL_START_TEST (elm_code_test_widget_text_tab_width)
16 char *args[] = { "exe" }; 16 char *args[] = { "exe" };
17 elm_init(1, args); 17 elm_init(1, args);
18 code = elm_code_create(); 18 code = elm_code_create();
19 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 19 win = win_add(NULL, "entry", ELM_WIN_BASIC);
20 widget = elm_code_widget_add(win, code); 20 widget = elm_code_widget_add(win, code);
21 elm_code_widget_tabstop_set(widget, 8); 21 elm_code_widget_tabstop_set(widget, 8);
22 22
@@ -44,7 +44,7 @@ EFL_START_TEST (elm_code_test_widget_text_position)
44 elm_code_file_line_append(file, "a\tb", 4, NULL); 44 elm_code_file_line_append(file, "a\tb", 4, NULL);
45 line = elm_code_file_line_get(file, 1); 45 line = elm_code_file_line_get(file, 1);
46 46
47 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 47 win = win_add(NULL, "entry", ELM_WIN_BASIC);
48 widget = elm_code_widget_add(win, code); 48 widget = elm_code_widget_add(win, code);
49 elm_code_widget_tabstop_set(widget, 8); 49 elm_code_widget_tabstop_set(widget, 8);
50 50
diff --git a/src/tests/elementary/elm_code_test_widget_undo.c b/src/tests/elementary/elm_code_test_widget_undo.c
index 248c0e4..9d3e59c 100644
--- a/src/tests/elementary/elm_code_test_widget_undo.c
+++ b/src/tests/elementary/elm_code_test_widget_undo.c
@@ -24,7 +24,7 @@ EFL_START_TEST (elm_code_test_widget_undo_text_insert)
24 file = elm_code_file_new(code); 24 file = elm_code_file_new(code);
25 elm_code_file_line_append(file, "test", 4, NULL); 25 elm_code_file_line_append(file, "test", 4, NULL);
26 26
27 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 27 win = win_add(NULL, "entry", ELM_WIN_BASIC);
28 widget = elm_code_widget_add(win, code); 28 widget = elm_code_widget_add(win, code);
29 29
30 elm_code_widget_text_at_cursor_insert(widget, "a"); 30 elm_code_widget_text_at_cursor_insert(widget, "a");
@@ -75,7 +75,7 @@ EFL_START_TEST (elm_code_test_widget_undo_text_insert_multiple)
75 file = elm_code_file_new(code); 75 file = elm_code_file_new(code);
76 elm_code_file_line_append(file, "test", 4, NULL); 76 elm_code_file_line_append(file, "test", 4, NULL);
77 77
78 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 78 win = win_add(NULL, "entry", ELM_WIN_BASIC);
79 widget = elm_code_widget_add(win, code); 79 widget = elm_code_widget_add(win, code);
80 80
81 elm_code_widget_text_at_cursor_insert(widget, "a"); 81 elm_code_widget_text_at_cursor_insert(widget, "a");
diff --git a/src/tests/elementary/elm_suite.c b/src/tests/elementary/elm_suite.c
index b7e07bd..b8e2a94 100644
--- a/src/tests/elementary/elm_suite.c
+++ b/src/tests/elementary/elm_suite.c
@@ -8,6 +8,7 @@
8 8
9static int main_pid = -1; 9static int main_pid = -1;
10static Eina_Bool did_shutdown; 10static Eina_Bool did_shutdown;
11static Evas_Object *global_win;
11 12
12static const Efl_Test_Case etc[] = { 13static const Efl_Test_Case etc[] = {
13 { "elm_config", elm_test_config }, 14 { "elm_config", elm_test_config },
@@ -130,10 +131,21 @@ static const Efl_Test_Case etc_init[] = {
130 { NULL, NULL } 131 { NULL, NULL }
131}; 132};
132 133
134Evas_Object *
135win_add()
136{
137 if (getpid() != main_pid)
138 {
139 if (global_win) return global_win;
140 }
141 return elm_win_add(NULL, "elm_suite", ELM_WIN_BASIC);;
142}
143
133int 144int
134main(int argc, char **argv) 145main(int argc, char **argv)
135{ 146{
136 int failed_count; 147 int failed_count;
148 Eina_Bool buffer = EINA_FALSE;
137 149
138 if (!_efl_test_option_disp(argc, argv, etc)) 150 if (!_efl_test_option_disp(argc, argv, etc))
139 return 0; 151 return 0;
@@ -144,13 +156,17 @@ main(int argc, char **argv)
144 if (!getenv("ELM_ENGINE")) 156 if (!getenv("ELM_ENGINE"))
145 putenv("ELM_ENGINE=buffer"); 157 putenv("ELM_ENGINE=buffer");
146 if (eina_streq(getenv("ELM_ENGINE"), "buffer")) 158 if (eina_streq(getenv("ELM_ENGINE"), "buffer"))
147 putenv("TESTS_GL_DISABLED=1"); 159 {
160 putenv("TESTS_GL_DISABLED=1");
161 buffer = EINA_TRUE;
162 }
148 163
149 main_pid = getpid(); 164 main_pid = getpid();
150 165
151 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1, 166 failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
152 "Elementary_Init", etc_init, SUITE_INIT_FN(elm), SUITE_SHUTDOWN_FN(elm)); 167 "Elementary_Init", etc_init, SUITE_INIT_FN(elm), SUITE_SHUTDOWN_FN(elm));
153 failed_count += !elm_init(1, (char*[]){"exe"}); 168 failed_count += !elm_init(1, (char*[]){"exe"});
169 if (buffer) global_win = elm_win_add(NULL, "elm_suite", ELM_WIN_BASIC);
154 EINA_SAFETY_ON_TRUE_RETURN_VAL(failed_count, 255); 170 EINA_SAFETY_ON_TRUE_RETURN_VAL(failed_count, 255);
155 /* preload default theme */ 171 /* preload default theme */
156 failed_count += !elm_theme_group_path_find(NULL, "elm/button/base/default"); 172 failed_count += !elm_theme_group_path_find(NULL, "elm/button/base/default");
diff --git a/src/tests/elementary/elm_suite.h b/src/tests/elementary/elm_suite.h
index 41a5bfc..f8ea895 100644
--- a/src/tests/elementary/elm_suite.h
+++ b/src/tests/elementary/elm_suite.h
@@ -4,6 +4,8 @@
4#include <check.h> 4#include <check.h>
5#include "elm_test_helper.h" 5#include "elm_test_helper.h"
6#include "../efl_check.h" 6#include "../efl_check.h"
7
8#include <Evas.h>
7void elm_test_init(TCase *tc); 9void elm_test_init(TCase *tc);
8void elm_test_config(TCase *tc); 10void elm_test_config(TCase *tc);
9void elm_test_check(TCase *tc); 11void elm_test_check(TCase *tc);
@@ -85,4 +87,6 @@ void elm_code_test_widget_text(TCase *tc);
85void elm_code_test_widget_selection(TCase *tc); 87void elm_code_test_widget_selection(TCase *tc);
86void elm_code_test_widget_undo(TCase *tc); 88void elm_code_test_widget_undo(TCase *tc);
87 89
90Evas_Object *win_add();
91
88#endif /* _ELM_SUITE_H */ 92#endif /* _ELM_SUITE_H */
diff --git a/src/tests/elementary/elm_test_actionslider.c b/src/tests/elementary/elm_test_actionslider.c
index 6adf7af..5509cc7 100644
--- a/src/tests/elementary/elm_test_actionslider.c
+++ b/src/tests/elementary/elm_test_actionslider.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_actionslider_legacy_type_check)
11 Evas_Object *win, *actionslider; 11 Evas_Object *win, *actionslider;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC); 14 win = win_add(NULL, "actionslider", ELM_WIN_BASIC);
15 15
16 actionslider = elm_actionslider_add(win); 16 actionslider = elm_actionslider_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *actionslider; 31 Evas_Object *win, *actionslider;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "actionslider", ELM_WIN_BASIC); 34 win = win_add(NULL, "actionslider", ELM_WIN_BASIC);
35 35
36 actionslider = elm_actionslider_add(win); 36 actionslider = elm_actionslider_add(win);
37 role = efl_access_object_role_get(actionslider); 37 role = efl_access_object_role_get(actionslider);
diff --git a/src/tests/elementary/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c
index 97524f4..1ff61da 100644
--- a/src/tests/elementary/elm_test_atspi.c
+++ b/src/tests/elementary/elm_test_atspi.c
@@ -14,7 +14,7 @@ static Evas_Object *g_win, *g_btn, *g_bg;
14 14
15void generate_app(void) 15void generate_app(void)
16{ 16{
17 g_win = elm_win_add(NULL, "Title", ELM_WIN_BASIC); 17 g_win = win_add(NULL, "Title", ELM_WIN_BASIC);
18 evas_object_geometry_set(g_win, 100, 100, 100, 100); 18 evas_object_geometry_set(g_win, 100, 100, 100, 100);
19 19
20 g_bg = elm_bg_add(g_win); 20 g_bg = elm_bg_add(g_win);
@@ -204,14 +204,14 @@ EFL_START_TEST (test_efl_access_children_and_parent)
204 204
205 //bg_child_list = efl_access_object_access_children_get(eina_list_nth(child_list, 0)); 205 //bg_child_list = efl_access_object_access_children_get(eina_list_nth(child_list, 0));
206 206
207 ck_assert(eina_list_count(child_list) == 1); 207 ck_assert_int_eq(eina_list_count(child_list), 1);
208 208
209 Eo *win = NULL; 209 Eo *win = NULL;
210 210
211 win = eina_list_nth(child_list, 0); 211 win = eina_list_nth(child_list, 0);
212 212
213 ck_assert(win != NULL); 213 ck_assert_ptr_ne(win, NULL);
214 ck_assert(win == g_win); 214 ck_assert_ptr_eq(win, g_win);
215 215
216 efl_del(root); 216 efl_del(root);
217} 217}
diff --git a/src/tests/elementary/elm_test_bg.c b/src/tests/elementary/elm_test_bg.c
index 6b4076c..979a3c2 100644
--- a/src/tests/elementary/elm_test_bg.c
+++ b/src/tests/elementary/elm_test_bg.c
@@ -10,7 +10,7 @@ EFL_START_TEST (elm_bg_legacy_type_check)
10 Evas_Object *win, *bg; 10 Evas_Object *win, *bg;
11 const char *type; 11 const char *type;
12 12
13 win = elm_win_add(NULL, "bg", ELM_WIN_BASIC); 13 win = win_add(NULL, "bg", ELM_WIN_BASIC);
14 14
15 bg = elm_bg_add(win); 15 bg = elm_bg_add(win);
16 16
@@ -30,7 +30,7 @@ EFL_START_TEST (elm_bg_legacy_file_set_get_check)
30 Evas_Object *win, *bg; 30 Evas_Object *win, *bg;
31 const char *file = NULL, *key = NULL; 31 const char *file = NULL, *key = NULL;
32 32
33 win = elm_win_add(NULL, "bg", ELM_WIN_BASIC); 33 win = win_add(NULL, "bg", ELM_WIN_BASIC);
34 34
35 bg = elm_bg_add(win); 35 bg = elm_bg_add(win);
36 36
diff --git a/src/tests/elementary/elm_test_box.c b/src/tests/elementary/elm_test_box.c
index 86e27c8..56261ec 100644
--- a/src/tests/elementary/elm_test_box.c
+++ b/src/tests/elementary/elm_test_box.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_box_legacy_type_check)
11 Evas_Object *win, *box; 11 Evas_Object *win, *box;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "box", ELM_WIN_BASIC); 14 win = win_add(NULL, "box", ELM_WIN_BASIC);
15 15
16 box = elm_box_add(win); 16 box = elm_box_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *box; 31 Evas_Object *win, *box;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "box", ELM_WIN_BASIC); 34 win = win_add(NULL, "box", ELM_WIN_BASIC);
35 35
36 box = elm_box_add(win); 36 box = elm_box_add(win);
37 role = efl_access_object_role_get(box); 37 role = efl_access_object_role_get(box);
diff --git a/src/tests/elementary/elm_test_bubble.c b/src/tests/elementary/elm_test_bubble.c
index dea1552..3d6d71c 100644
--- a/src/tests/elementary/elm_test_bubble.c
+++ b/src/tests/elementary/elm_test_bubble.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_bubble_legacy_type_check)
11 Evas_Object *win, *bubble; 11 Evas_Object *win, *bubble;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC); 14 win = win_add(NULL, "bubble", ELM_WIN_BASIC);
15 15
16 bubble = elm_bubble_add(win); 16 bubble = elm_bubble_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *bubble; 31 Evas_Object *win, *bubble;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "bubble", ELM_WIN_BASIC); 34 win = win_add(NULL, "bubble", ELM_WIN_BASIC);
35 35
36 bubble = elm_bubble_add(win); 36 bubble = elm_bubble_add(win);
37 role = efl_access_object_role_get(bubble); 37 role = efl_access_object_role_get(bubble);
diff --git a/src/tests/elementary/elm_test_button.c b/src/tests/elementary/elm_test_button.c
index 99f15ef..f5bf6f1 100644
--- a/src/tests/elementary/elm_test_button.c
+++ b/src/tests/elementary/elm_test_button.c
@@ -13,7 +13,7 @@ EFL_START_TEST (elm_button_legacy_type_check)
13 Evas_Object *win, *button; 13 Evas_Object *win, *button;
14 const char *type; 14 const char *type;
15 15
16 win = elm_win_add(NULL, "button", ELM_WIN_BASIC); 16 win = win_add(NULL, "button", ELM_WIN_BASIC);
17 17
18 button = elm_button_add(win); 18 button = elm_button_add(win);
19 19
@@ -33,7 +33,7 @@ EFL_START_TEST (elm_atspi_role_get)
33 Evas_Object *win, *button; 33 Evas_Object *win, *button;
34 Efl_Access_Role role; 34 Efl_Access_Role role;
35 35
36 win = elm_win_add(NULL, "button", ELM_WIN_BASIC); 36 win = win_add(NULL, "button", ELM_WIN_BASIC);
37 37
38 button = elm_button_add(win); 38 button = elm_button_add(win);
39 role = efl_access_object_role_get(button); 39 role = efl_access_object_role_get(button);
@@ -47,7 +47,7 @@ EFL_START_TEST (elm_atspi_interfaces_check)
47{ 47{
48 Evas_Object *win, *button; 48 Evas_Object *win, *button;
49 49
50 win = elm_win_add(NULL, "button", ELM_WIN_BASIC); 50 win = win_add(NULL, "button", ELM_WIN_BASIC);
51 51
52 button = elm_button_add(win); 52 button = elm_button_add(win);
53 53
diff --git a/src/tests/elementary/elm_test_calendar.c b/src/tests/elementary/elm_test_calendar.c
index 8ac4d3d..cf30958 100644
--- a/src/tests/elementary/elm_test_calendar.c
+++ b/src/tests/elementary/elm_test_calendar.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_calendar_legacy_type_check)
11 Evas_Object *win, *calendar; 11 Evas_Object *win, *calendar;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC); 14 win = win_add(NULL, "calendar", ELM_WIN_BASIC);
15 15
16 calendar = elm_calendar_add(win); 16 calendar = elm_calendar_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *calendar; 31 Evas_Object *win, *calendar;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC); 34 win = win_add(NULL, "calendar", ELM_WIN_BASIC);
35 35
36 calendar = elm_calendar_add(win); 36 calendar = elm_calendar_add(win);
37 role = efl_access_object_role_get(calendar); 37 role = efl_access_object_role_get(calendar);
diff --git a/src/tests/elementary/elm_test_check.c b/src/tests/elementary/elm_test_check.c
index 243c38e..af65407 100644
--- a/src/tests/elementary/elm_test_check.c
+++ b/src/tests/elementary/elm_test_check.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_check_legacy_type_check)
11 Evas_Object *win, *check; 11 Evas_Object *win, *check;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "check", ELM_WIN_BASIC); 14 win = win_add(NULL, "check", ELM_WIN_BASIC);
15 15
16 check = elm_check_add(win); 16 check = elm_check_add(win);
17 17
@@ -30,7 +30,7 @@ EFL_START_TEST (elm_check_onoff_text)
30{ 30{
31 Evas_Object *win, *check; 31 Evas_Object *win, *check;
32 32
33 win = elm_win_add(NULL, "check", ELM_WIN_BASIC); 33 win = win_add(NULL, "check", ELM_WIN_BASIC);
34 34
35 check = elm_check_add(win); 35 check = elm_check_add(win);
36 elm_object_style_set(check, "toggle"); 36 elm_object_style_set(check, "toggle");
@@ -52,7 +52,7 @@ EFL_START_TEST (elm_check_state)
52 Evas_Object *win, *check; 52 Evas_Object *win, *check;
53 Eina_Bool state = EINA_TRUE; 53 Eina_Bool state = EINA_TRUE;
54 54
55 win = elm_win_add(NULL, "check", ELM_WIN_BASIC); 55 win = win_add(NULL, "check", ELM_WIN_BASIC);
56 56
57 check = elm_check_add(win); 57 check = elm_check_add(win);
58 elm_check_state_pointer_set(check, &state); 58 elm_check_state_pointer_set(check, &state);
@@ -71,7 +71,7 @@ EFL_START_TEST (elm_atspi_role_get)
71 Evas_Object *win, *check; 71 Evas_Object *win, *check;
72 Efl_Access_Role role; 72 Efl_Access_Role role;
73 73
74 win = elm_win_add(NULL, "check", ELM_WIN_BASIC); 74 win = win_add(NULL, "check", ELM_WIN_BASIC);
75 75
76 check = elm_check_add(win); 76 check = elm_check_add(win);
77 role = efl_access_object_role_get(check); 77 role = efl_access_object_role_get(check);
diff --git a/src/tests/elementary/elm_test_clock.c b/src/tests/elementary/elm_test_clock.c
index 568cb5b..fde065e 100644
--- a/src/tests/elementary/elm_test_clock.c
+++ b/src/tests/elementary/elm_test_clock.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_clock_legacy_type_check)
11 Evas_Object *win, *clock; 11 Evas_Object *win, *clock;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "clock", ELM_WIN_BASIC); 14 win = win_add(NULL, "clock", ELM_WIN_BASIC);
15 15
16 clock = elm_clock_add(win); 16 clock = elm_clock_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *clk; 31 Evas_Object *win, *clk;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "clock", ELM_WIN_BASIC); 34 win = win_add(NULL, "clock", ELM_WIN_BASIC);
35 35
36 clk = elm_clock_add(win); 36 clk = elm_clock_add(win);
37 role = efl_access_object_role_get(clk); 37 role = efl_access_object_role_get(clk);
diff --git a/src/tests/elementary/elm_test_colorselector.c b/src/tests/elementary/elm_test_colorselector.c
index bc7a055..194856f 100644
--- a/src/tests/elementary/elm_test_colorselector.c
+++ b/src/tests/elementary/elm_test_colorselector.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_colorselector_legacy_type_check)
11 Evas_Object *win, *colorselector; 11 Evas_Object *win, *colorselector;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC); 14 win = win_add(NULL, "colorselector", ELM_WIN_BASIC);
15 15
16 colorselector = elm_colorselector_add(win); 16 colorselector = elm_colorselector_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_colorselector_palette)
31 Evas_Object *win, *c; 31 Evas_Object *win, *c;
32 unsigned int palette_cnt; 32 unsigned int palette_cnt;
33 33
34 win = elm_win_add(NULL, "check", ELM_WIN_BASIC); 34 win = win_add(NULL, "check", ELM_WIN_BASIC);
35 35
36 c = elm_colorselector_add(win); 36 c = elm_colorselector_add(win);
37 /* Get the count of default palettes */ 37 /* Get the count of default palettes */
@@ -56,7 +56,7 @@ EFL_START_TEST (elm_atspi_role_get)
56 Evas_Object *win, *c; 56 Evas_Object *win, *c;
57 Efl_Access_Role role; 57 Efl_Access_Role role;
58 58
59 win = elm_win_add(NULL, "colorselector", ELM_WIN_BASIC); 59 win = win_add(NULL, "colorselector", ELM_WIN_BASIC);
60 60
61 c = elm_colorselector_add(win); 61 c = elm_colorselector_add(win);
62 role = efl_access_object_role_get(c); 62 role = efl_access_object_role_get(c);
diff --git a/src/tests/elementary/elm_test_conformant.c b/src/tests/elementary/elm_test_conformant.c
index 5bd0454..cdfbd04 100644
--- a/src/tests/elementary/elm_test_conformant.c
+++ b/src/tests/elementary/elm_test_conformant.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_conformant_legacy_type_check)
11 Evas_Object *win, *conformant; 11 Evas_Object *win, *conformant;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC); 14 win = win_add(NULL, "conformant", ELM_WIN_BASIC);
15 15
16 conformant = elm_conformant_add(win); 16 conformant = elm_conformant_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *conformant; 31 Evas_Object *win, *conformant;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC); 34 win = win_add(NULL, "conformant", ELM_WIN_BASIC);
35 35
36 conformant = elm_conformant_add(win); 36 conformant = elm_conformant_add(win);
37 role = efl_access_object_role_get(conformant); 37 role = efl_access_object_role_get(conformant);
diff --git a/src/tests/elementary/elm_test_ctxpopup.c b/src/tests/elementary/elm_test_ctxpopup.c
index 7d482b8..a9d066e 100644
--- a/src/tests/elementary/elm_test_ctxpopup.c
+++ b/src/tests/elementary/elm_test_ctxpopup.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_ctxpopup_legacy_type_check)
11 Evas_Object *win, *ctxpopup; 11 Evas_Object *win, *ctxpopup;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "ctxpopup", ELM_WIN_BASIC); 14 win = win_add(NULL, "ctxpopup", ELM_WIN_BASIC);
15 15
16 ctxpopup = elm_ctxpopup_add(win); 16 ctxpopup = elm_ctxpopup_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *ctxpopup; 31 Evas_Object *win, *ctxpopup;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); 34 win = win_add(NULL, "icon", ELM_WIN_BASIC);
35 35
36 ctxpopup = elm_ctxpopup_add(win); 36 ctxpopup = elm_ctxpopup_add(win);
37 role = efl_access_object_role_get(ctxpopup); 37 role = efl_access_object_role_get(ctxpopup);
diff --git a/src/tests/elementary/elm_test_datetime.c b/src/tests/elementary/elm_test_datetime.c
index 3f35de7..7a87451 100644
--- a/src/tests/elementary/elm_test_datetime.c
+++ b/src/tests/elementary/elm_test_datetime.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_datetime_legacy_type_check)
11 Evas_Object *win, *datetime; 11 Evas_Object *win, *datetime;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "datetime", ELM_WIN_BASIC); 14 win = win_add(NULL, "datetime", ELM_WIN_BASIC);
15 15
16 datetime = elm_datetime_add(win); 16 datetime = elm_datetime_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *datetime; 31 Evas_Object *win, *datetime;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "datetime", ELM_WIN_BASIC); 34 win = win_add(NULL, "datetime", ELM_WIN_BASIC);
35 35
36 datetime = elm_datetime_add(win); 36 datetime = elm_datetime_add(win);
37 role = efl_access_object_role_get(datetime); 37 role = efl_access_object_role_get(datetime);
diff --git a/src/tests/elementary/elm_test_dayselector.c b/src/tests/elementary/elm_test_dayselector.c
index c92eb8f..776687a 100644
--- a/src/tests/elementary/elm_test_dayselector.c
+++ b/src/tests/elementary/elm_test_dayselector.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_dayselector_legacy_type_check)
11 Evas_Object *win, *dayselector; 11 Evas_Object *win, *dayselector;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC); 14 win = win_add(NULL, "dayselector", ELM_WIN_BASIC);
15 15
16 dayselector = elm_dayselector_add(win); 16 dayselector = elm_dayselector_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *dayselector; 31 Evas_Object *win, *dayselector;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "dayselector", ELM_WIN_BASIC); 34 win = win_add(NULL, "dayselector", ELM_WIN_BASIC);
35 35
36 dayselector = elm_dayselector_add(win); 36 dayselector = elm_dayselector_add(win);
37 role = efl_access_object_role_get(dayselector); 37 role = efl_access_object_role_get(dayselector);
diff --git a/src/tests/elementary/elm_test_diskselector.c b/src/tests/elementary/elm_test_diskselector.c
index 19162cd..19bf360 100644
--- a/src/tests/elementary/elm_test_diskselector.c
+++ b/src/tests/elementary/elm_test_diskselector.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_diskselector_legacy_type_check)
11 Evas_Object *win, *diskselector; 11 Evas_Object *win, *diskselector;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC); 14 win = win_add(NULL, "diskselector", ELM_WIN_BASIC);
15 15
16 diskselector = elm_diskselector_add(win); 16 diskselector = elm_diskselector_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *diskselector; 31 Evas_Object *win, *diskselector;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC); 34 win = win_add(NULL, "diskselector", ELM_WIN_BASIC);
35 35
36 diskselector = elm_diskselector_add(win); 36 diskselector = elm_diskselector_add(win);
37 role = efl_access_object_role_get(diskselector); 37 role = efl_access_object_role_get(diskselector);
diff --git a/src/tests/elementary/elm_test_entry.c b/src/tests/elementary/elm_test_entry.c
index 3fde6b9..8b80911 100644
--- a/src/tests/elementary/elm_test_entry.c
+++ b/src/tests/elementary/elm_test_entry.c
@@ -13,7 +13,7 @@ EFL_START_TEST (elm_entry_legacy_type_check)
13 Evas_Object *win, *entry; 13 Evas_Object *win, *entry;
14 const char *type; 14 const char *type;
15 15
16 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 16 win = win_add(NULL, "entry", ELM_WIN_BASIC);
17 17
18 entry = elm_entry_add(win); 18 entry = elm_entry_add(win);
19 19
@@ -32,7 +32,7 @@ EFL_START_TEST (elm_entry_del)
32{ 32{
33 Evas_Object *win, *entry; 33 Evas_Object *win, *entry;
34 34
35 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 35 win = win_add(NULL, "entry", ELM_WIN_BASIC);
36 36
37 entry = elm_entry_add(win); 37 entry = elm_entry_add(win);
38 elm_object_text_set(entry, "TEST"); 38 elm_object_text_set(entry, "TEST");
@@ -52,7 +52,7 @@ EFL_START_TEST (elm_entry_signal_callback)
52 void *data; 52 void *data;
53 int k; 53 int k;
54 54
55 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 55 win = win_add(NULL, "entry", ELM_WIN_BASIC);
56 56
57 entry = elm_entry_add(win); 57 entry = elm_entry_add(win);
58 58
@@ -94,7 +94,7 @@ EFL_START_TEST (elm_entry_atspi_text_char_get)
94 const char *txt = "ĄA11Y Ł TEST"; 94 const char *txt = "ĄA11Y Ł TEST";
95 const char *mtxt = "<b>ĄA11Y</b> <title>Ł</> TEST"; 95 const char *mtxt = "<b>ĄA11Y</b> <title>Ł</> TEST";
96 96
97 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 97 win = win_add(NULL, "entry", ELM_WIN_BASIC);
98 98
99 entry = elm_entry_add(win); 99 entry = elm_entry_add(win);
100 elm_object_text_set(entry, mtxt); 100 elm_object_text_set(entry, mtxt);
@@ -130,7 +130,7 @@ EFL_START_TEST (elm_entry_atspi_text_char_count)
130 130
131 const char *mtxt = "<b>AĄ11Y</b> <title>Ł</> TEST"; 131 const char *mtxt = "<b>AĄ11Y</b> <title>Ł</> TEST";
132 132
133 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 133 win = win_add(NULL, "entry", ELM_WIN_BASIC);
134 134
135 entry = elm_entry_add(win); 135 entry = elm_entry_add(win);
136 elm_object_text_set(entry, mtxt); 136 elm_object_text_set(entry, mtxt);
@@ -149,7 +149,7 @@ EFL_START_TEST (elm_entry_atspi_text_string_get_char)
149 149
150 const char *txt = "Lorem ipśum dolor sit amęt"; 150 const char *txt = "Lorem ipśum dolor sit amęt";
151 151
152 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 152 win = win_add(NULL, "entry", ELM_WIN_BASIC);
153 153
154 entry = elm_entry_add(win); 154 entry = elm_entry_add(win);
155 elm_object_text_set(entry, txt); 155 elm_object_text_set(entry, txt);
@@ -192,7 +192,7 @@ EFL_START_TEST (elm_entry_atspi_text_string_get_word)
192 192
193 const char *txt = "Lorem ipśum dolor sit amęt"; 193 const char *txt = "Lorem ipśum dolor sit amęt";
194 194
195 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 195 win = win_add(NULL, "entry", ELM_WIN_BASIC);
196 196
197 entry = elm_entry_add(win); 197 entry = elm_entry_add(win);
198 elm_object_text_set(entry, txt); 198 elm_object_text_set(entry, txt);
@@ -236,7 +236,7 @@ EFL_START_TEST (elm_entry_atspi_text_string_get_paragraph)
236 236
237 const char *txt = "Lorem ipśum<br> dolor sit<br> amęt"; 237 const char *txt = "Lorem ipśum<br> dolor sit<br> amęt";
238 238
239 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 239 win = win_add(NULL, "entry", ELM_WIN_BASIC);
240 240
241 entry = elm_entry_add(win); 241 entry = elm_entry_add(win);
242 elm_object_text_set(entry, txt); 242 elm_object_text_set(entry, txt);
@@ -280,7 +280,7 @@ EFL_START_TEST (elm_entry_atspi_text_string_get_line)
280 280
281 const char *txt = "Lorem ipśum<br> dolor sit amęt"; 281 const char *txt = "Lorem ipśum<br> dolor sit amęt";
282 282
283 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 283 win = win_add(NULL, "entry", ELM_WIN_BASIC);
284 284
285 entry = elm_entry_add(win); 285 entry = elm_entry_add(win);
286 evas_object_resize(entry, 500, 500); 286 evas_object_resize(entry, 500, 500);
@@ -311,7 +311,7 @@ EFL_START_TEST (elm_entry_atspi_text_text_get)
311 char *val; 311 char *val;
312 const char *txt = "Lorem Xpśum dolor sit amęt"; 312 const char *txt = "Lorem Xpśum dolor sit amęt";
313 313
314 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 314 win = win_add(NULL, "entry", ELM_WIN_BASIC);
315 315
316 entry = elm_entry_add(win); 316 entry = elm_entry_add(win);
317 elm_object_text_set(entry, txt); 317 elm_object_text_set(entry, txt);
@@ -342,7 +342,7 @@ EFL_START_TEST (elm_entry_atspi_text_selections)
342 Eina_Bool ret; 342 Eina_Bool ret;
343 const char *txt = "Lorem ipśum<br> dolor sit\n amęt"; 343 const char *txt = "Lorem ipśum<br> dolor sit\n amęt";
344 344
345 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 345 win = win_add(NULL, "entry", ELM_WIN_BASIC);
346 346
347 entry = elm_entry_add(win); 347 entry = elm_entry_add(win);
348 elm_object_text_set(entry, txt); 348 elm_object_text_set(entry, txt);
@@ -383,7 +383,7 @@ EFL_START_TEST (elm_atspi_role_get)
383 Evas_Object *win, *entry; 383 Evas_Object *win, *entry;
384 Efl_Access_Role role; 384 Efl_Access_Role role;
385 385
386 win = elm_win_add(NULL, "entry", ELM_WIN_BASIC); 386 win = win_add(NULL, "entry", ELM_WIN_BASIC);
387 387
388 entry = elm_entry_add(win); 388 entry = elm_entry_add(win);
389 role = efl_access_object_role_get(entry); 389 role = efl_access_object_role_get(entry);
diff --git a/src/tests/elementary/elm_test_fileselector.c b/src/tests/elementary/elm_test_fileselector.c
index d62ee34..5a5d913 100644
--- a/src/tests/elementary/elm_test_fileselector.c
+++ b/src/tests/elementary/elm_test_fileselector.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_fileselector_legacy_type_check)
11 Evas_Object *win, *fileselector; 11 Evas_Object *win, *fileselector;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC); 14 win = win_add(NULL, "fileselector", ELM_WIN_BASIC);
15 15
16 fileselector = elm_fileselector_add(win); 16 fileselector = elm_fileselector_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *fileselector; 31 Evas_Object *win, *fileselector;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC); 34 win = win_add(NULL, "fileselector", ELM_WIN_BASIC);
35 35
36 fileselector = elm_fileselector_add(win); 36 fileselector = elm_fileselector_add(win);
37 role = efl_access_object_role_get(fileselector); 37 role = efl_access_object_role_get(fileselector);
@@ -72,7 +72,7 @@ EFL_START_TEST (elm_fileselector_selected)
72 fp = fopen(exist, "w"); 72 fp = fopen(exist, "w");
73 fclose(fp); 73 fclose(fp);
74 74
75 win = elm_win_add(NULL, "fileselector", ELM_WIN_BASIC); 75 win = win_add(NULL, "fileselector", ELM_WIN_BASIC);
76 76
77 fileselector = elm_fileselector_add(win); 77 fileselector = elm_fileselector_add(win);
78 evas_object_smart_callback_add(fileselector, "directory,open", _ready_cb, &open); 78 evas_object_smart_callback_add(fileselector, "directory,open", _ready_cb, &open);
diff --git a/src/tests/elementary/elm_test_fileselector_button.c b/src/tests/elementary/elm_test_fileselector_button.c
index 5d315d9..c5bba5c 100644
--- a/src/tests/elementary/elm_test_fileselector_button.c
+++ b/src/tests/elementary/elm_test_fileselector_button.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_fileselector_button_legacy_type_check)
11 Evas_Object *win, *fs_button; 11 Evas_Object *win, *fs_button;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "fileselector_button", ELM_WIN_BASIC); 14 win = win_add(NULL, "fileselector_button", ELM_WIN_BASIC);
15 15
16 fs_button = elm_fileselector_button_add(win); 16 fs_button = elm_fileselector_button_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *fs_button; 31 Evas_Object *win, *fs_button;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "fileselector_button", ELM_WIN_BASIC); 34 win = win_add(NULL, "fileselector_button", ELM_WIN_BASIC);
35 35
36 fs_button = elm_fileselector_button_add(win); 36 fs_button = elm_fileselector_button_add(win);
37 role = efl_access_object_role_get(fs_button); 37 role = efl_access_object_role_get(fs_button);
diff --git a/src/tests/elementary/elm_test_fileselector_entry.c b/src/tests/elementary/elm_test_fileselector_entry.c
index 9d7cfc4..9fa0f14 100644
--- a/src/tests/elementary/elm_test_fileselector_entry.c
+++ b/src/tests/elementary/elm_test_fileselector_entry.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_fileselector_entry_legacy_type_check)
11 Evas_Object *win, *fileselector_entry; 11 Evas_Object *win, *fileselector_entry;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "fileselector_entry", ELM_WIN_BASIC); 14 win = win_add(NULL, "fileselector_entry", ELM_WIN_BASIC);
15 15
16 fileselector_entry = elm_fileselector_entry_add(win); 16 fileselector_entry = elm_fileselector_entry_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *fs_entry; 31 Evas_Object *win, *fs_entry;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "fileselectorentry", ELM_WIN_BASIC); 34 win = win_add(NULL, "fileselectorentry", ELM_WIN_BASIC);
35 35
36 fs_entry = elm_fileselector_entry_add(win); 36 fs_entry = elm_fileselector_entry_add(win);
37 role = efl_access_object_role_get(fs_entry); 37 role = efl_access_object_role_get(fs_entry);
diff --git a/src/tests/elementary/elm_test_flip.c b/src/tests/elementary/elm_test_flip.c
index 661105d..c0bbd4e 100644
--- a/src/tests/elementary/elm_test_flip.c
+++ b/src/tests/elementary/elm_test_flip.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_flip_legacy_type_check)
11 Evas_Object *win, *flip; 11 Evas_Object *win, *flip;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "flip", ELM_WIN_BASIC); 14 win = win_add(NULL, "flip", ELM_WIN_BASIC);
15 15
16 flip = elm_flip_add(win); 16 flip = elm_flip_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *flip; 31 Evas_Object *win, *flip;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "flip", ELM_WIN_BASIC); 34 win = win_add(NULL, "flip", ELM_WIN_BASIC);
35 35
36 flip = elm_flip_add(win); 36 flip = elm_flip_add(win);
37 role = efl_access_object_role_get(flip); 37 role = efl_access_object_role_get(flip);
diff --git a/src/tests/elementary/elm_test_flipselector.c b/src/tests/elementary/elm_test_flipselector.c
index ba15290..a4c3baf 100644
--- a/src/tests/elementary/elm_test_flipselector.c
+++ b/src/tests/elementary/elm_test_flipselector.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_flipselector_legacy_type_check)
11 Evas_Object *win, *flipselector; 11 Evas_Object *win, *flipselector;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC); 14 win = win_add(NULL, "flipselector", ELM_WIN_BASIC);
15 15
16 flipselector = elm_flipselector_add(win); 16 flipselector = elm_flipselector_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *flipselector; 31 Evas_Object *win, *flipselector;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "flipselector", ELM_WIN_BASIC); 34 win = win_add(NULL, "flipselector", ELM_WIN_BASIC);
35 35
36 flipselector = elm_flipselector_add(win); 36 flipselector = elm_flipselector_add(win);
37 role = efl_access_object_role_get(flipselector); 37 role = efl_access_object_role_get(flipselector);
diff --git a/src/tests/elementary/elm_test_frame.c b/src/tests/elementary/elm_test_frame.c
index 0d0492a..4b56c91 100644
--- a/src/tests/elementary/elm_test_frame.c
+++ b/src/tests/elementary/elm_test_frame.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_frame_legacy_type_check)
11 Evas_Object *win, *frame; 11 Evas_Object *win, *frame;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "frame", ELM_WIN_BASIC); 14 win = win_add(NULL, "frame", ELM_WIN_BASIC);
15 15
16 frame = elm_frame_add(win); 16 frame = elm_frame_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *frame; 31 Evas_Object *win, *frame;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "frame", ELM_WIN_BASIC); 34 win = win_add(NULL, "frame", ELM_WIN_BASIC);
35 35
36 frame = elm_frame_add(win); 36 frame = elm_frame_add(win);
37 role = efl_access_object_role_get(frame); 37 role = efl_access_object_role_get(frame);
diff --git a/src/tests/elementary/elm_test_gengrid.c b/src/tests/elementary/elm_test_gengrid.c
index 9134b2f..b388891 100644
--- a/src/tests/elementary/elm_test_gengrid.c
+++ b/src/tests/elementary/elm_test_gengrid.c
@@ -12,7 +12,7 @@ EFL_START_TEST (elm_gengrid_legacy_type_check)
12 Evas_Object *win, *gengrid; 12 Evas_Object *win, *gengrid;
13 const char *type; 13 const char *type;
14 14
15 win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC); 15 win = win_add(NULL, "gengrid", ELM_WIN_BASIC);
16 16
17 gengrid = elm_gengrid_add(win); 17 gengrid = elm_gengrid_add(win);
18 18
@@ -32,7 +32,7 @@ EFL_START_TEST (elm_atspi_role_get)
32 Evas_Object *win, *gengrid; 32 Evas_Object *win, *gengrid;
33 Efl_Access_Role role; 33 Efl_Access_Role role;
34 34
35 win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC); 35 win = win_add(NULL, "gengrid", ELM_WIN_BASIC);
36 36
37 gengrid = elm_gengrid_add(win); 37 gengrid = elm_gengrid_add(win);
38 role = efl_access_object_role_get(gengrid); 38 role = efl_access_object_role_get(gengrid);
@@ -64,7 +64,7 @@ EFL_START_TEST(elm_atspi_children_parent)
64 elm_config_atspi_mode_set(EINA_TRUE); 64 elm_config_atspi_mode_set(EINA_TRUE);
65 static Elm_Gengrid_Item_Class itc; 65 static Elm_Gengrid_Item_Class itc;
66 66
67 Evas_Object *win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC); 67 Evas_Object *win = win_add(NULL, "gengrid", ELM_WIN_BASIC);
68 evas_object_resize(win, 100, 100); 68 evas_object_resize(win, 100, 100);
69 Evas_Object *gengrid = elm_gengrid_add(win); 69 Evas_Object *gengrid = elm_gengrid_add(win);
70 evas_object_resize(gengrid, 100, 100); 70 evas_object_resize(gengrid, 100, 100);
diff --git a/src/tests/elementary/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c
index 74b7575..e317bfc 100644
--- a/src/tests/elementary/elm_test_genlist.c
+++ b/src/tests/elementary/elm_test_genlist.c
@@ -58,7 +58,7 @@ EFL_START_TEST (elm_genlist_group)
58 Elm_Object_Item *git; 58 Elm_Object_Item *git;
59 int i; 59 int i;
60 60
61 win = elm_win_add(NULL, "genlist", ELM_WIN_BASIC); 61 win = win_add(NULL, "genlist", ELM_WIN_BASIC);
62 62
63 genlist = elm_genlist_add(win); 63 genlist = elm_genlist_add(win);
64 64
@@ -75,7 +75,7 @@ EFL_START_TEST (elm_genlist_legacy_type_check)
75{ 75{
76 const char *type; 76 const char *type;
77 77
78 win = elm_win_add(NULL, "genlist", ELM_WIN_BASIC); 78 win = win_add(NULL, "genlist", ELM_WIN_BASIC);
79 79
80 genlist = elm_genlist_add(win); 80 genlist = elm_genlist_add(win);
81 81
@@ -93,7 +93,7 @@ EFL_END_TEST
93void test_init(void) 93void test_init(void)
94{ 94{
95 elm_config_atspi_mode_set(EINA_TRUE); 95 elm_config_atspi_mode_set(EINA_TRUE);
96 win = elm_win_add(NULL, "genlist", ELM_WIN_BASIC); 96 win = win_add(NULL, "genlist", ELM_WIN_BASIC);
97 genlist = elm_genlist_add(win); 97 genlist = elm_genlist_add(win);
98} 98}
99 99
@@ -270,7 +270,7 @@ EFL_START_TEST(elm_genlist_item_destroy)
270{ 270{
271 Elm_Object_Item *git; 271 Elm_Object_Item *git;
272 272
273 win = elm_win_add(NULL, "genlist", ELM_WIN_BASIC); 273 win = win_add(NULL, "genlist", ELM_WIN_BASIC);
274 274
275 genlist = elm_genlist_add(win); 275 genlist = elm_genlist_add(win);
276 efl_event_callback_add(genlist, EFL_EVENT_DESTRUCT, _gl_destroy, NULL); 276 efl_event_callback_add(genlist, EFL_EVENT_DESTRUCT, _gl_destroy, NULL);
diff --git a/src/tests/elementary/elm_test_glview.c b/src/tests/elementary/elm_test_glview.c
index 7c38e45..2d1c8a3 100644
--- a/src/tests/elementary/elm_test_glview.c
+++ b/src/tests/elementary/elm_test_glview.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_glview_legacy_type_check)
11 Evas_Object *win, *glview; 11 Evas_Object *win, *glview;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "glview", ELM_WIN_BASIC); 14 win = win_add(NULL, "glview", ELM_WIN_BASIC);
15 15
16 glview = elm_glview_add(win); 16 glview = elm_glview_add(win);
17 17
@@ -34,7 +34,7 @@ EFL_START_TEST (elm_atspi_role_get)
34 Evas_Object *win, *glview; 34 Evas_Object *win, *glview;
35 Efl_Access_Role role; 35 Efl_Access_Role role;
36 36
37 win = elm_win_add(NULL, "glview", ELM_WIN_BASIC); 37 win = win_add(NULL, "glview", ELM_WIN_BASIC);
38 38
39 glview = elm_glview_add(win); 39 glview = elm_glview_add(win);
40 40
diff --git a/src/tests/elementary/elm_test_grid.c b/src/tests/elementary/elm_test_grid.c
index f7c74e0..f014c71 100644
--- a/src/tests/elementary/elm_test_grid.c
+++ b/src/tests/elementary/elm_test_grid.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_grid_legacy_type_check)
11 Evas_Object *win, *grid; 11 Evas_Object *win, *grid;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "grid", ELM_WIN_BASIC); 14 win = win_add(NULL, "grid", ELM_WIN_BASIC);
15 15
16 grid = elm_grid_add(win); 16 grid = elm_grid_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *grid; 31 Evas_Object *win, *grid;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "grid", ELM_WIN_BASIC); 34 win = win_add(NULL, "grid", ELM_WIN_BASIC);
35 35
36 grid = elm_grid_add(win); 36 grid = elm_grid_add(win);
37 role = efl_access_object_role_get(grid); 37 role = efl_access_object_role_get(grid);
diff --git a/src/tests/elementary/elm_test_hover.c b/src/tests/elementary/elm_test_hover.c
index 4455f87..42db4b6 100644
--- a/src/tests/elementary/elm_test_hover.c
+++ b/src/tests/elementary/elm_test_hover.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_hover_legacy_type_check)
11 Evas_Object *win, *hover; 11 Evas_Object *win, *hover;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "hover", ELM_WIN_BASIC); 14 win = win_add(NULL, "hover", ELM_WIN_BASIC);
15 15
16 hover = elm_hover_add(win); 16 hover = elm_hover_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *hover; 31 Evas_Object *win, *hover;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "hover", ELM_WIN_BASIC); 34 win = win_add(NULL, "hover", ELM_WIN_BASIC);
35 35
36 hover = elm_hover_add(win); 36 hover = elm_hover_add(win);
37 role = efl_access_object_role_get(hover); 37 role = efl_access_object_role_get(hover);
diff --git a/src/tests/elementary/elm_test_hoversel.c b/src/tests/elementary/elm_test_hoversel.c
index cf27c0a..982ab6f 100644
--- a/src/tests/elementary/elm_test_hoversel.c
+++ b/src/tests/elementary/elm_test_hoversel.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_hoversel_legacy_type_check)
11 Evas_Object *win, *hoversel; 11 Evas_Object *win, *hoversel;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC); 14 win = win_add(NULL, "hoversel", ELM_WIN_BASIC);
15 15
16 hoversel = elm_hoversel_add(win); 16 hoversel = elm_hoversel_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *hoversel; 31 Evas_Object *win, *hoversel;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "hoversel", ELM_WIN_BASIC); 34 win = win_add(NULL, "hoversel", ELM_WIN_BASIC);
35 35
36 hoversel = elm_hoversel_add(win); 36 hoversel = elm_hoversel_add(win);
37 role = efl_access_object_role_get(hoversel); 37 role = efl_access_object_role_get(hoversel);
diff --git a/src/tests/elementary/elm_test_icon.c b/src/tests/elementary/elm_test_icon.c
index 1b9aa33..9580e4e 100644
--- a/src/tests/elementary/elm_test_icon.c
+++ b/src/tests/elementary/elm_test_icon.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_icon_legacy_type_check)
11 Evas_Object *win, *icon; 11 Evas_Object *win, *icon;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); 14 win = win_add(NULL, "icon", ELM_WIN_BASIC);
15 15
16 icon = elm_icon_add(win); 16 icon = elm_icon_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *icon; 31 Evas_Object *win, *icon;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); 34 win = win_add(NULL, "icon", ELM_WIN_BASIC);
35 35
36 icon = elm_icon_add(win); 36 icon = elm_icon_add(win);
37 role = efl_access_object_role_get(icon); 37 role = efl_access_object_role_get(icon);
diff --git a/src/tests/elementary/elm_test_image.c b/src/tests/elementary/elm_test_image.c
index 0efb0e4..41b7e70 100644
--- a/src/tests/elementary/elm_test_image.c
+++ b/src/tests/elementary/elm_test_image.c
@@ -22,7 +22,7 @@ EFL_START_TEST (elm_image_legacy_type_check)
22 Evas_Object *win, *image; 22 Evas_Object *win, *image;
23 const char *type; 23 const char *type;
24 24
25 win = elm_win_add(NULL, "image", ELM_WIN_BASIC); 25 win = win_add(NULL, "image", ELM_WIN_BASIC);
26 26
27 image = elm_image_add(win); 27 image = elm_image_add(win);
28 28
@@ -42,7 +42,7 @@ EFL_START_TEST (elm_atspi_role_get)
42 Evas_Object *win, *image; 42 Evas_Object *win, *image;
43 Efl_Access_Role role; 43 Efl_Access_Role role;
44 44
45 win = elm_win_add(NULL, "image", ELM_WIN_BASIC); 45 win = win_add(NULL, "image", ELM_WIN_BASIC);
46 46
47 image = elm_image_add(win); 47 image = elm_image_add(win);
48 role = efl_access_object_role_get(image); 48 role = efl_access_object_role_get(image);
@@ -133,7 +133,7 @@ EFL_START_TEST (elm_image_async_path)
133 Eina_Bool ok; 133 Eina_Bool ok;
134 Test_Data td; 134 Test_Data td;
135 135
136 win = elm_win_add(NULL, "image", ELM_WIN_BASIC); 136 win = win_add(NULL, "image", ELM_WIN_BASIC);
137 137
138 td.success = 0; 138 td.success = 0;
139 td.image_id = 0; 139 td.image_id = 0;
@@ -163,7 +163,7 @@ EFL_START_TEST (elm_image_async_mmap)
163 Eina_File *f; 163 Eina_File *f;
164 char path[PATH_MAX]; 164 char path[PATH_MAX];
165 165
166 win = elm_win_add(NULL, "image", ELM_WIN_BASIC); 166 win = win_add(NULL, "image", ELM_WIN_BASIC);
167 167
168 td.success = 1; // skip "error" case 168 td.success = 1; // skip "error" case
169 td.image_id = 1; 169 td.image_id = 1;
@@ -197,7 +197,7 @@ EFL_START_TEST (efl_ui_image_icon)
197 Eina_Bool ok; 197 Eina_Bool ok;
198 const char *icon_name; 198 const char *icon_name;
199 199
200 win = elm_win_add(NULL, "image", ELM_WIN_BASIC); 200 win = win_add(NULL, "image", ELM_WIN_BASIC);
201 201
202 image = efl_add(EFL_UI_IMAGE_CLASS, win); 202 image = efl_add(EFL_UI_IMAGE_CLASS, win);
203 evas_object_show(image); 203 evas_object_show(image);
diff --git a/src/tests/elementary/elm_test_index.c b/src/tests/elementary/elm_test_index.c
index 75d365e..c335da6 100644
--- a/src/tests/elementary/elm_test_index.c
+++ b/src/tests/elementary/elm_test_index.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_index_legacy_type_check)
11 Evas_Object *win, *index; 11 Evas_Object *win, *index;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "index", ELM_WIN_BASIC); 14 win = win_add(NULL, "index", ELM_WIN_BASIC);
15 15
16 index = elm_index_add(win); 16 index = elm_index_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *idx; 31 Evas_Object *win, *idx;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "index", ELM_WIN_BASIC); 34 win = win_add(NULL, "index", ELM_WIN_BASIC);
35 35
36 idx = elm_index_add(win); 36 idx = elm_index_add(win);
37 role = efl_access_object_role_get(idx); 37 role = efl_access_object_role_get(idx);
diff --git a/src/tests/elementary/elm_test_inwin.c b/src/tests/elementary/elm_test_inwin.c
index c330a63..5817aeb 100644
--- a/src/tests/elementary/elm_test_inwin.c
+++ b/src/tests/elementary/elm_test_inwin.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_inwin_legacy_type_check)
11 Evas_Object *win, *inwin; 11 Evas_Object *win, *inwin;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC); 14 win = win_add(NULL, "inwin", ELM_WIN_BASIC);
15 15
16 inwin = elm_win_inwin_add(win); 16 inwin = elm_win_inwin_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *inwin; 31 Evas_Object *win, *inwin;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC); 34 win = win_add(NULL, "inwin", ELM_WIN_BASIC);
35 35
36 inwin = elm_win_inwin_add(win); 36 inwin = elm_win_inwin_add(win);
37 role = efl_access_object_role_get(inwin); 37 role = efl_access_object_role_get(inwin);
diff --git a/src/tests/elementary/elm_test_label.c b/src/tests/elementary/elm_test_label.c
index a79ae73..55ca1be 100644
--- a/src/tests/elementary/elm_test_label.c
+++ b/src/tests/elementary/elm_test_label.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_label_legacy_type_check)
11 Evas_Object *win, *label; 11 Evas_Object *win, *label;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "label", ELM_WIN_BASIC); 14 win = win_add(NULL, "label", ELM_WIN_BASIC);
15 15
16 label = elm_label_add(win); 16 label = elm_label_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *label; 31 Evas_Object *win, *label;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "label", ELM_WIN_BASIC); 34 win = win_add(NULL, "label", ELM_WIN_BASIC);
35 35
36 label = elm_label_add(win); 36 label = elm_label_add(win);
37 role = efl_access_object_role_get(label); 37 role = efl_access_object_role_get(label);
diff --git a/src/tests/elementary/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c
index 476c0cb..cdd372e 100644
--- a/src/tests/elementary/elm_test_layout.c
+++ b/src/tests/elementary/elm_test_layout.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_layout_legacy_type_check)
11 Evas_Object *win, *layout; 11 Evas_Object *win, *layout;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); 14 win = win_add(NULL, "layout", ELM_WIN_BASIC);
15 15
16 layout = elm_layout_add(win); 16 layout = elm_layout_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST(elm_atspi_role_get)
31 Evas_Object *win, *layout; 31 Evas_Object *win, *layout;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); 34 win = win_add(NULL, "layout", ELM_WIN_BASIC);
35 35
36 layout = elm_layout_add(win); 36 layout = elm_layout_add(win);
37 role = efl_access_object_role_get(layout); 37 role = efl_access_object_role_get(layout);
@@ -46,7 +46,7 @@ EFL_START_TEST(elm_layout_swallows)
46 char buf[PATH_MAX]; 46 char buf[PATH_MAX];
47 Evas_Object *win, *ly, *bt, *bt2; 47 Evas_Object *win, *ly, *bt, *bt2;
48 48
49 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); 49 win = win_add(NULL, "layout", ELM_WIN_BASIC);
50 50
51 ly = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, win); 51 ly = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, win);
52 snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR); 52 snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR);
@@ -79,7 +79,7 @@ EFL_START_TEST(elm_layout_model_connect)
79 const char *part_text; 79 const char *part_text;
80 const char text_value[] = "A random string for elm_layout_model_connect test"; 80 const char text_value[] = "A random string for elm_layout_model_connect test";
81 81
82 win = elm_win_add(NULL, "layout", ELM_WIN_BASIC); 82 win = win_add(NULL, "layout", ELM_WIN_BASIC);
83 83
84 ly = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, win); 84 ly = efl_add(EFL_UI_LAYOUT_OBJECT_CLASS, win);
85 snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR); 85 snprintf(buf, sizeof(buf), "%s/objects/test.edj", ELM_TEST_DATA_DIR);
diff --git a/src/tests/elementary/elm_test_list.c b/src/tests/elementary/elm_test_list.c
index 67a4663..1252926 100644
--- a/src/tests/elementary/elm_test_list.c
+++ b/src/tests/elementary/elm_test_list.c
@@ -13,7 +13,7 @@ EFL_START_TEST (elm_list_legacy_type_check)
13 Evas_Object *win, *list; 13 Evas_Object *win, *list;
14 const char *type; 14 const char *type;
15 15
16 win = elm_win_add(NULL, "list", ELM_WIN_BASIC); 16 win = win_add(NULL, "list", ELM_WIN_BASIC);
17 17
18 list = elm_list_add(win); 18 list = elm_list_add(win);
19 19
@@ -39,7 +39,7 @@ EFL_START_TEST (elm_list_atspi_selection_selected_children_count_get)
39 int val; 39 int val;
40 40
41 41
42 win = elm_win_add(NULL, "list", ELM_WIN_BASIC); 42 win = win_add(NULL, "list", ELM_WIN_BASIC);
43 43
44 list = elm_list_add(win); 44 list = elm_list_add(win);
45 item = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL); 45 item = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL);
@@ -65,7 +65,7 @@ EFL_START_TEST (elm_list_atspi_selection_child_select)
65 Eina_Bool val; 65 Eina_Bool val;
66 66
67 67
68 win = elm_win_add(NULL, "list", ELM_WIN_BASIC); 68 win = win_add(NULL, "list", ELM_WIN_BASIC);
69 69
70 list = elm_list_add(win); 70 list = elm_list_add(win);
71 item = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL); 71 item = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL);
@@ -84,7 +84,7 @@ EFL_START_TEST (elm_list_atspi_selection_selected_child_deselect)
84 Eina_Bool val; 84 Eina_Bool val;
85 85
86 86
87 win = elm_win_add(NULL, "list", ELM_WIN_BASIC); 87 win = win_add(NULL, "list", ELM_WIN_BASIC);
88 88
89 list = elm_list_add(win); 89 list = elm_list_add(win);
90 elm_list_multi_select_set(list, EINA_TRUE); 90 elm_list_multi_select_set(list, EINA_TRUE);
@@ -106,7 +106,7 @@ EFL_START_TEST (elm_list_atspi_selection_is_child_selected)
106 Eina_Bool val; 106 Eina_Bool val;
107 107
108 108
109 win = elm_win_add(NULL, "list", ELM_WIN_BASIC); 109 win = win_add(NULL, "list", ELM_WIN_BASIC);
110 110
111 list = elm_list_add(win); 111 list = elm_list_add(win);
112 item = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL); 112 item = elm_list_item_append(list, "First Element", NULL, NULL, NULL, NULL);
@@ -128,7 +128,7 @@ EFL_START_TEST (elm_list_atspi_selection_all_children_select)
128 Eina_Bool val; 128 Eina_Bool val;
129 129
130 130
131 win = elm_win_add(NULL, "list", ELM_WIN_BASIC); 131 win = win_add(NULL, "list", ELM_WIN_BASIC);
132 132
133 list = elm_list_add(win); 133 list = elm_list_add(win);
134 134
@@ -155,7 +155,7 @@ EFL_START_TEST (elm_list_atspi_selection_clear)
155 Eina_Bool val; 155 Eina_Bool val;
156 156
157 157
158 win = elm_win_add(NULL, "list", ELM_WIN_BASIC); 158 win = win_add(NULL, "list", ELM_WIN_BASIC);
159 159
160 list = elm_list_add(win); 160 list = elm_list_add(win);
161 elm_list_multi_select_set(list, EINA_TRUE); 161 elm_list_multi_select_set(list, EINA_TRUE);
@@ -180,7 +180,7 @@ EFL_START_TEST (elm_list_atspi_selection_child_deselect)
180 Eina_Bool val; 180 Eina_Bool val;
181 181
182 182
183 win = elm_win_add(NULL, "list", ELM_WIN_BASIC); 183 win = win_add(NULL, "list", ELM_WIN_BASIC);
184 184
185 list = elm_list_add(win); 185 list = elm_list_add(win);
186 elm_list_multi_select_set(list, EINA_TRUE); 186 elm_list_multi_select_set(list, EINA_TRUE);
@@ -203,7 +203,7 @@ EFL_START_TEST (elm_atspi_role_get)
203 Efl_Access_Role role; 203 Efl_Access_Role role;
204 204
205 205
206 win = elm_win_add(NULL, "list", ELM_WIN_BASIC); 206 win = win_add(NULL, "list", ELM_WIN_BASIC);
207 207
208 list = elm_list_add(win); 208 list = elm_list_add(win);
209 role = efl_access_object_role_get(list); 209 role = efl_access_object_role_get(list);
@@ -223,7 +223,7 @@ EFL_START_TEST(elm_atspi_children_parent)
223 Efl_Access_Object *parent; 223 Efl_Access_Object *parent;
224 Elm_Object_Item *it; 224 Elm_Object_Item *it;
225 225
226 Evas_Object *win = elm_win_add(NULL, "list", ELM_WIN_BASIC); 226 Evas_Object *win = win_add(NULL, "list", ELM_WIN_BASIC);
227 227
228 Evas_Object *icon = elm_icon_add(win); 228 Evas_Object *icon = elm_icon_add(win);
229 Evas_Object *end = elm_icon_add(win); 229 Evas_Object *end = elm_icon_add(win);
diff --git a/src/tests/elementary/elm_test_map.c b/src/tests/elementary/elm_test_map.c
index 5e5b07c..c39da35 100644
--- a/src/tests/elementary/elm_test_map.c
+++ b/src/tests/elementary/elm_test_map.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_map_legacy_type_check)
11 Evas_Object *win, *map; 11 Evas_Object *win, *map;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "map", ELM_WIN_BASIC); 14 win = win_add(NULL, "map", ELM_WIN_BASIC);
15 15
16 map = elm_map_add(win); 16 map = elm_map_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *map; 31 Evas_Object *win, *map;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "map", ELM_WIN_BASIC); 34 win = win_add(NULL, "map", ELM_WIN_BASIC);
35 35
36 map = elm_map_add(win); 36 map = elm_map_add(win);
37 role = efl_access_object_role_get(map); 37 role = efl_access_object_role_get(map);
diff --git a/src/tests/elementary/elm_test_mapbuf.c b/src/tests/elementary/elm_test_mapbuf.c
index bf4c1e6..9a1111d 100644
--- a/src/tests/elementary/elm_test_mapbuf.c
+++ b/src/tests/elementary/elm_test_mapbuf.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_mapbuf_legacy_type_check)
11 Evas_Object *win, *mapbuf; 11 Evas_Object *win, *mapbuf;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC); 14 win = win_add(NULL, "mapbuf", ELM_WIN_BASIC);
15 15
16 mapbuf = elm_mapbuf_add(win); 16 mapbuf = elm_mapbuf_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *mapbuf; 31 Evas_Object *win, *mapbuf;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "mapbuf", ELM_WIN_BASIC); 34 win = win_add(NULL, "mapbuf", ELM_WIN_BASIC);
35 35
36 mapbuf = elm_mapbuf_add(win); 36 mapbuf = elm_mapbuf_add(win);
37 role = efl_access_object_role_get(mapbuf); 37 role = efl_access_object_role_get(mapbuf);
diff --git a/src/tests/elementary/elm_test_menu.c b/src/tests/elementary/elm_test_menu.c
index 16ce607..05b9996 100644
--- a/src/tests/elementary/elm_test_menu.c
+++ b/src/tests/elementary/elm_test_menu.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_menu_legacy_type_check)
11 Evas_Object *win, *menu; 11 Evas_Object *win, *menu;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "menu", ELM_WIN_BASIC); 14 win = win_add(NULL, "menu", ELM_WIN_BASIC);
15 15
16 menu = elm_menu_add(win); 16 menu = elm_menu_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *menu; 31 Evas_Object *win, *menu;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "menu", ELM_WIN_BASIC); 34 win = win_add(NULL, "menu", ELM_WIN_BASIC);
35 35
36 menu = elm_menu_add(win); 36 menu = elm_menu_add(win);
37 role = efl_access_object_role_get(menu); 37 role = efl_access_object_role_get(menu);
diff --git a/src/tests/elementary/elm_test_multibuttonentry.c b/src/tests/elementary/elm_test_multibuttonentry.c
index 501a79e..b611b39 100644
--- a/src/tests/elementary/elm_test_multibuttonentry.c
+++ b/src/tests/elementary/elm_test_multibuttonentry.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_multibuttonentry_legacy_type_check)
11 Evas_Object *win, *multibuttonentry; 11 Evas_Object *win, *multibuttonentry;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "multibuttonentry", ELM_WIN_BASIC); 14 win = win_add(NULL, "multibuttonentry", ELM_WIN_BASIC);
15 15
16 multibuttonentry = elm_multibuttonentry_add(win); 16 multibuttonentry = elm_multibuttonentry_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *multibuttonentry; 31 Evas_Object *win, *multibuttonentry;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "multibuttonentry", ELM_WIN_BASIC); 34 win = win_add(NULL, "multibuttonentry", ELM_WIN_BASIC);
35 35
36 multibuttonentry = elm_multibuttonentry_add(win); 36 multibuttonentry = elm_multibuttonentry_add(win);
37 role = efl_access_object_role_get(multibuttonentry); 37 role = efl_access_object_role_get(multibuttonentry);
diff --git a/src/tests/elementary/elm_test_naviframe.c b/src/tests/elementary/elm_test_naviframe.c
index 4e34ba5..f28f2e2 100644
--- a/src/tests/elementary/elm_test_naviframe.c
+++ b/src/tests/elementary/elm_test_naviframe.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_naviframe_legacy_type_check)
11 Evas_Object *win, *naviframe; 11 Evas_Object *win, *naviframe;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC); 14 win = win_add(NULL, "naviframe", ELM_WIN_BASIC);
15 15
16 naviframe = elm_naviframe_add(win); 16 naviframe = elm_naviframe_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *naviframe; 31 Evas_Object *win, *naviframe;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "naviframe", ELM_WIN_BASIC); 34 win = win_add(NULL, "naviframe", ELM_WIN_BASIC);
35 35
36 naviframe = elm_naviframe_add(win); 36 naviframe = elm_naviframe_add(win);
37 role = efl_access_object_role_get(naviframe); 37 role = efl_access_object_role_get(naviframe);
diff --git a/src/tests/elementary/elm_test_notify.c b/src/tests/elementary/elm_test_notify.c
index a7e890a..d32e596 100644
--- a/src/tests/elementary/elm_test_notify.c
+++ b/src/tests/elementary/elm_test_notify.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_notify_legacy_type_check)
11 Evas_Object *win, *notify; 11 Evas_Object *win, *notify;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "notify", ELM_WIN_BASIC); 14 win = win_add(NULL, "notify", ELM_WIN_BASIC);
15 15
16 notify = elm_notify_add(win); 16 notify = elm_notify_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *notify; 31 Evas_Object *win, *notify;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "notify", ELM_WIN_BASIC); 34 win = win_add(NULL, "notify", ELM_WIN_BASIC);
35 35
36 notify = elm_notify_add(win); 36 notify = elm_notify_add(win);
37 role = efl_access_object_role_get(notify); 37 role = efl_access_object_role_get(notify);
diff --git a/src/tests/elementary/elm_test_panel.c b/src/tests/elementary/elm_test_panel.c
index e10995f..2460443 100644
--- a/src/tests/elementary/elm_test_panel.c
+++ b/src/tests/elementary/elm_test_panel.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_panel_legacy_type_check)
11 Evas_Object *win, *panel; 11 Evas_Object *win, *panel;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "panel", ELM_WIN_BASIC); 14 win = win_add(NULL, "panel", ELM_WIN_BASIC);
15 15
16 panel = elm_panel_add(win); 16 panel = elm_panel_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *panel; 31 Evas_Object *win, *panel;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "panel", ELM_WIN_BASIC); 34 win = win_add(NULL, "panel", ELM_WIN_BASIC);
35 35
36 panel = elm_panel_add(win); 36 panel = elm_panel_add(win);
37 role = efl_access_object_role_get(panel); 37 role = efl_access_object_role_get(panel);
diff --git a/src/tests/elementary/elm_test_panes.c b/src/tests/elementary/elm_test_panes.c
index f084ee6..367fce6 100644
--- a/src/tests/elementary/elm_test_panes.c
+++ b/src/tests/elementary/elm_test_panes.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_panes_legacy_type_check)
11 Evas_Object *win, *panes; 11 Evas_Object *win, *panes;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "panes", ELM_WIN_BASIC); 14 win = win_add(NULL, "panes", ELM_WIN_BASIC);
15 15
16 panes = elm_panes_add(win); 16 panes = elm_panes_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *panes; 31 Evas_Object *win, *panes;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "panes", ELM_WIN_BASIC); 34 win = win_add(NULL, "panes", ELM_WIN_BASIC);
35 35
36 panes = elm_panes_add(win); 36 panes = elm_panes_add(win);
37 role = efl_access_object_role_get(panes); 37 role = efl_access_object_role_get(panes);
diff --git a/src/tests/elementary/elm_test_photo.c b/src/tests/elementary/elm_test_photo.c
index 29ddcdb..ec61099 100644
--- a/src/tests/elementary/elm_test_photo.c
+++ b/src/tests/elementary/elm_test_photo.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_photo_legacy_type_check)
11 Evas_Object *win, *photo; 11 Evas_Object *win, *photo;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "photo", ELM_WIN_BASIC); 14 win = win_add(NULL, "photo", ELM_WIN_BASIC);
15 15
16 photo = elm_photo_add(win); 16 photo = elm_photo_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *photo; 31 Evas_Object *win, *photo;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "photo", ELM_WIN_BASIC); 34 win = win_add(NULL, "photo", ELM_WIN_BASIC);
35 35
36 photo = elm_photo_add(win); 36 photo = elm_photo_add(win);
37 role = efl_access_object_role_get(photo); 37 role = efl_access_object_role_get(photo);
diff --git a/src/tests/elementary/elm_test_photocam.c b/src/tests/elementary/elm_test_photocam.c
index d374cbd..311b735 100644
--- a/src/tests/elementary/elm_test_photocam.c
+++ b/src/tests/elementary/elm_test_photocam.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_photocam_legacy_type_check)
11 Evas_Object *win, *photocam; 11 Evas_Object *win, *photocam;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC); 14 win = win_add(NULL, "photocam", ELM_WIN_BASIC);
15 15
16 photocam = elm_photocam_add(win); 16 photocam = elm_photocam_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *photocam; 31 Evas_Object *win, *photocam;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC); 34 win = win_add(NULL, "photocam", ELM_WIN_BASIC);
35 35
36 photocam = elm_photocam_add(win); 36 photocam = elm_photocam_add(win);
37 role = efl_access_object_role_get(photocam); 37 role = efl_access_object_role_get(photocam);
@@ -47,7 +47,7 @@ EFL_START_TEST (efl_ui_image_zoomable_icon)
47 Eina_Bool ok; 47 Eina_Bool ok;
48 const char *icon_name; 48 const char *icon_name;
49 49
50 win = elm_win_add(NULL, "photocam", ELM_WIN_BASIC); 50 win = win_add(NULL, "photocam", ELM_WIN_BASIC);
51 51
52 img_zoomable = efl_add(EFL_UI_IMAGE_ZOOMABLE_CLASS, win); 52 img_zoomable = efl_add(EFL_UI_IMAGE_ZOOMABLE_CLASS, win);
53 evas_object_show(img_zoomable); 53 evas_object_show(img_zoomable);
diff --git a/src/tests/elementary/elm_test_player.c b/src/tests/elementary/elm_test_player.c
index c300a27..307aa30 100644
--- a/src/tests/elementary/elm_test_player.c
+++ b/src/tests/elementary/elm_test_player.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_player_legacy_type_check)
11 Evas_Object *win, *player; 11 Evas_Object *win, *player;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "player", ELM_WIN_BASIC); 14 win = win_add(NULL, "player", ELM_WIN_BASIC);
15 15
16 player = elm_player_add(win); 16 player = elm_player_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *player; 31 Evas_Object *win, *player;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "player", ELM_WIN_BASIC); 34 win = win_add(NULL, "player", ELM_WIN_BASIC);
35 35
36 player = elm_player_add(win); 36 player = elm_player_add(win);
37 role = efl_access_object_role_get(player); 37 role = efl_access_object_role_get(player);
diff --git a/src/tests/elementary/elm_test_plug.c b/src/tests/elementary/elm_test_plug.c
index dff2d69..3f34418 100644
--- a/src/tests/elementary/elm_test_plug.c
+++ b/src/tests/elementary/elm_test_plug.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_plug_legacy_type_check)
11 Evas_Object *win, *plug; 11 Evas_Object *win, *plug;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "plug", ELM_WIN_BASIC); 14 win = win_add(NULL, "plug", ELM_WIN_BASIC);
15 15
16 plug = elm_plug_add(win); 16 plug = elm_plug_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *plug; 31 Evas_Object *win, *plug;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "plug", ELM_WIN_BASIC); 34 win = win_add(NULL, "plug", ELM_WIN_BASIC);
35 35
36 plug = elm_plug_add(win); 36 plug = elm_plug_add(win);
37 role = efl_access_object_role_get(plug); 37 role = efl_access_object_role_get(plug);
diff --git a/src/tests/elementary/elm_test_popup.c b/src/tests/elementary/elm_test_popup.c
index 99c07c6..4defd3e 100644
--- a/src/tests/elementary/elm_test_popup.c
+++ b/src/tests/elementary/elm_test_popup.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_popup_legacy_type_check)
11 Evas_Object *win, *popup; 11 Evas_Object *win, *popup;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "popup", ELM_WIN_BASIC); 14 win = win_add(NULL, "popup", ELM_WIN_BASIC);
15 15
16 popup = elm_popup_add(win); 16 popup = elm_popup_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *popup; 31 Evas_Object *win, *popup;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "popup", ELM_WIN_BASIC); 34 win = win_add(NULL, "popup", ELM_WIN_BASIC);
35 35
36 popup = elm_popup_add(win); 36 popup = elm_popup_add(win);
37 role = efl_access_object_role_get(popup); 37 role = efl_access_object_role_get(popup);
diff --git a/src/tests/elementary/elm_test_prefs.c b/src/tests/elementary/elm_test_prefs.c
index a881512..64186e5 100644
--- a/src/tests/elementary/elm_test_prefs.c
+++ b/src/tests/elementary/elm_test_prefs.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_prefs_legacy_type_check)
11 Evas_Object *win, *prefs; 11 Evas_Object *win, *prefs;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "prefs", ELM_WIN_BASIC); 14 win = win_add(NULL, "prefs", ELM_WIN_BASIC);
15 15
16 prefs = elm_prefs_add(win); 16 prefs = elm_prefs_add(win);
17 17
@@ -35,7 +35,7 @@ EFL_START_TEST (elm_atspi_role_get)
35 Evas_Object *win, *prefs; 35 Evas_Object *win, *prefs;
36 Efl_Access_Role role; 36 Efl_Access_Role role;
37 37
38 win = elm_win_add(NULL, "prefs", ELM_WIN_BASIC); 38 win = win_add(NULL, "prefs", ELM_WIN_BASIC);
39 39
40 prefs = elm_prefs_add(win); 40 prefs = elm_prefs_add(win);
41 role = efl_access_object_role_get(prefs); 41 role = efl_access_object_role_get(prefs);
diff --git a/src/tests/elementary/elm_test_progressbar.c b/src/tests/elementary/elm_test_progressbar.c
index e561bb3..c0f6f0f 100644
--- a/src/tests/elementary/elm_test_progressbar.c
+++ b/src/tests/elementary/elm_test_progressbar.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_progressbar_legacy_type_check)
11 Evas_Object *win, *progressbar; 11 Evas_Object *win, *progressbar;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC); 14 win = win_add(NULL, "progressbar", ELM_WIN_BASIC);
15 15
16 progressbar = elm_progressbar_add(win); 16 progressbar = elm_progressbar_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *progressbar; 31 Evas_Object *win, *progressbar;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC); 34 win = win_add(NULL, "progressbar", ELM_WIN_BASIC);
35 35
36 progressbar = elm_progressbar_add(win); 36 progressbar = elm_progressbar_add(win);
37 role = efl_access_object_role_get(progressbar); 37 role = efl_access_object_role_get(progressbar);
diff --git a/src/tests/elementary/elm_test_radio.c b/src/tests/elementary/elm_test_radio.c
index 13de95d..fedc14f 100644
--- a/src/tests/elementary/elm_test_radio.c
+++ b/src/tests/elementary/elm_test_radio.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_radio_legacy_type_check)
11 Evas_Object *win, *radio; 11 Evas_Object *win, *radio;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "radio", ELM_WIN_BASIC); 14 win = win_add(NULL, "radio", ELM_WIN_BASIC);
15 15
16 radio = elm_radio_add(win); 16 radio = elm_radio_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *radio; 31 Evas_Object *win, *radio;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "radio", ELM_WIN_BASIC); 34 win = win_add(NULL, "radio", ELM_WIN_BASIC);
35 35
36 radio = elm_radio_add(win); 36 radio = elm_radio_add(win);
37 role = efl_access_object_role_get(radio); 37 role = efl_access_object_role_get(radio);
diff --git a/src/tests/elementary/elm_test_scroller.c b/src/tests/elementary/elm_test_scroller.c
index 00df003..cd2b52d 100644
--- a/src/tests/elementary/elm_test_scroller.c
+++ b/src/tests/elementary/elm_test_scroller.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_scroller_legacy_type_check)
11 Evas_Object *win, *scroller; 11 Evas_Object *win, *scroller;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC); 14 win = win_add(NULL, "scroller", ELM_WIN_BASIC);
15 15
16 scroller = elm_scroller_add(win); 16 scroller = elm_scroller_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *scroller; 31 Evas_Object *win, *scroller;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC); 34 win = win_add(NULL, "scroller", ELM_WIN_BASIC);
35 35
36 scroller = elm_scroller_add(win); 36 scroller = elm_scroller_add(win);
37 role = efl_access_object_role_get(scroller); 37 role = efl_access_object_role_get(scroller);
diff --git a/src/tests/elementary/elm_test_segmentcontrol.c b/src/tests/elementary/elm_test_segmentcontrol.c
index fa57c06..7f29ce7 100644
--- a/src/tests/elementary/elm_test_segmentcontrol.c
+++ b/src/tests/elementary/elm_test_segmentcontrol.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_segment_control_legacy_type_check)
11 Evas_Object *win, *segment_control; 11 Evas_Object *win, *segment_control;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "segment_control", ELM_WIN_BASIC); 14 win = win_add(NULL, "segment_control", ELM_WIN_BASIC);
15 15
16 segment_control = elm_segment_control_add(win); 16 segment_control = elm_segment_control_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *segmentcontrol; 31 Evas_Object *win, *segmentcontrol;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "segmentcontrol", ELM_WIN_BASIC); 34 win = win_add(NULL, "segmentcontrol", ELM_WIN_BASIC);
35 35
36 segmentcontrol = elm_segment_control_add(win); 36 segmentcontrol = elm_segment_control_add(win);
37 role = efl_access_object_role_get(segmentcontrol); 37 role = efl_access_object_role_get(segmentcontrol);
diff --git a/src/tests/elementary/elm_test_separator.c b/src/tests/elementary/elm_test_separator.c
index a986385..568e1c2 100644
--- a/src/tests/elementary/elm_test_separator.c
+++ b/src/tests/elementary/elm_test_separator.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_separator_legacy_type_check)
11 Evas_Object *win, *separator; 11 Evas_Object *win, *separator;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "separator", ELM_WIN_BASIC); 14 win = win_add(NULL, "separator", ELM_WIN_BASIC);
15 15
16 separator = elm_separator_add(win); 16 separator = elm_separator_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *separator; 31 Evas_Object *win, *separator;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "icon", ELM_WIN_BASIC); 34 win = win_add(NULL, "icon", ELM_WIN_BASIC);
35 35
36 separator = elm_separator_add(win); 36 separator = elm_separator_add(win);
37 role = efl_access_object_role_get(separator); 37 role = efl_access_object_role_get(separator);
diff --git a/src/tests/elementary/elm_test_slider.c b/src/tests/elementary/elm_test_slider.c
index b3445a0..f28682f 100644
--- a/src/tests/elementary/elm_test_slider.c
+++ b/src/tests/elementary/elm_test_slider.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_slider_legacy_type_check)
11 Evas_Object *win, *slider; 11 Evas_Object *win, *slider;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "slider", ELM_WIN_BASIC); 14 win = win_add(NULL, "slider", ELM_WIN_BASIC);
15 15
16 slider = elm_slider_add(win); 16 slider = elm_slider_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *slider; 31 Evas_Object *win, *slider;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "slider", ELM_WIN_BASIC); 34 win = win_add(NULL, "slider", ELM_WIN_BASIC);
35 35
36 slider = elm_slider_add(win); 36 slider = elm_slider_add(win);
37 role = efl_access_object_role_get(slider); 37 role = efl_access_object_role_get(slider);
diff --git a/src/tests/elementary/elm_test_slideshow.c b/src/tests/elementary/elm_test_slideshow.c
index 31e4edc..25ec7dd 100644
--- a/src/tests/elementary/elm_test_slideshow.c
+++ b/src/tests/elementary/elm_test_slideshow.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_slideshow_legacy_type_check)
11 Evas_Object *win, *slideshow; 11 Evas_Object *win, *slideshow;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC); 14 win = win_add(NULL, "slideshow", ELM_WIN_BASIC);
15 15
16 slideshow = elm_slideshow_add(win); 16 slideshow = elm_slideshow_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *slideshow; 31 Evas_Object *win, *slideshow;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "slideshow", ELM_WIN_BASIC); 34 win = win_add(NULL, "slideshow", ELM_WIN_BASIC);
35 35
36 slideshow = elm_slideshow_add(win); 36 slideshow = elm_slideshow_add(win);
37 role = efl_access_object_role_get(slideshow); 37 role = efl_access_object_role_get(slideshow);
diff --git a/src/tests/elementary/elm_test_spinner.c b/src/tests/elementary/elm_test_spinner.c
index c954ef5..a6da140 100644
--- a/src/tests/elementary/elm_test_spinner.c
+++ b/src/tests/elementary/elm_test_spinner.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_spinner_legacy_type_check)
11 Evas_Object *win, *spinner; 11 Evas_Object *win, *spinner;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC); 14 win = win_add(NULL, "spinner", ELM_WIN_BASIC);
15 15
16 spinner = elm_spinner_add(win); 16 spinner = elm_spinner_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *spinner; 31 Evas_Object *win, *spinner;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "spinner", ELM_WIN_BASIC); 34 win = win_add(NULL, "spinner", ELM_WIN_BASIC);
35 35
36 spinner = elm_spinner_add(win); 36 spinner = elm_spinner_add(win);
37 role = efl_access_object_role_get(spinner); 37 role = efl_access_object_role_get(spinner);
diff --git a/src/tests/elementary/elm_test_table.c b/src/tests/elementary/elm_test_table.c
index 6fb1c70..4ba1551 100644
--- a/src/tests/elementary/elm_test_table.c
+++ b/src/tests/elementary/elm_test_table.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_table_legacy_type_check)
11 Evas_Object *win, *table; 11 Evas_Object *win, *table;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "table", ELM_WIN_BASIC); 14 win = win_add(NULL, "table", ELM_WIN_BASIC);
15 15
16 table = elm_table_add(win); 16 table = elm_table_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *table; 31 Evas_Object *win, *table;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "table", ELM_WIN_BASIC); 34 win = win_add(NULL, "table", ELM_WIN_BASIC);
35 35
36 table = elm_table_add(win); 36 table = elm_table_add(win);
37 role = efl_access_object_role_get(table); 37 role = efl_access_object_role_get(table);
diff --git a/src/tests/elementary/elm_test_thumb.c b/src/tests/elementary/elm_test_thumb.c
index a4983b8..9ca838d 100644
--- a/src/tests/elementary/elm_test_thumb.c
+++ b/src/tests/elementary/elm_test_thumb.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_thumb_legacy_type_check)
11 Evas_Object *win, *thumb; 11 Evas_Object *win, *thumb;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC); 14 win = win_add(NULL, "thumb", ELM_WIN_BASIC);
15 15
16 thumb = elm_thumb_add(win); 16 thumb = elm_thumb_add(win);
17 17
@@ -32,7 +32,7 @@ EFL_START_TEST (elm_atspi_role_get)
32 Evas_Object *win, *thumb; 32 Evas_Object *win, *thumb;
33 Efl_Access_Role role; 33 Efl_Access_Role role;
34 34
35 win = elm_win_add(NULL, "thumb", ELM_WIN_BASIC); 35 win = win_add(NULL, "thumb", ELM_WIN_BASIC);
36 36
37 thumb = elm_thumb_add(win); 37 thumb = elm_thumb_add(win);
38 role = efl_access_object_role_get(thumb); 38 role = efl_access_object_role_get(thumb);
diff --git a/src/tests/elementary/elm_test_toolbar.c b/src/tests/elementary/elm_test_toolbar.c
index 3922127..b10350d 100644
--- a/src/tests/elementary/elm_test_toolbar.c
+++ b/src/tests/elementary/elm_test_toolbar.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_toolbar_legacy_type_check)
11 Evas_Object *win, *toolbar; 11 Evas_Object *win, *toolbar;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC); 14 win = win_add(NULL, "toolbar", ELM_WIN_BASIC);
15 15
16 toolbar = elm_toolbar_add(win); 16 toolbar = elm_toolbar_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *toolbar; 31 Evas_Object *win, *toolbar;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "toolbar", ELM_WIN_BASIC); 34 win = win_add(NULL, "toolbar", ELM_WIN_BASIC);
35 35
36 toolbar = elm_toolbar_add(win); 36 toolbar = elm_toolbar_add(win);
37 role = efl_access_object_role_get(toolbar); 37 role = efl_access_object_role_get(toolbar);
diff --git a/src/tests/elementary/elm_test_video.c b/src/tests/elementary/elm_test_video.c
index e643475..676e128 100644
--- a/src/tests/elementary/elm_test_video.c
+++ b/src/tests/elementary/elm_test_video.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_video_legacy_type_check)
11 Evas_Object *win, *video; 11 Evas_Object *win, *video;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "video", ELM_WIN_BASIC); 14 win = win_add(NULL, "video", ELM_WIN_BASIC);
15 15
16 video = elm_video_add(win); 16 video = elm_video_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *video; 31 Evas_Object *win, *video;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "video", ELM_WIN_BASIC); 34 win = win_add(NULL, "video", ELM_WIN_BASIC);
35 35
36 video = elm_video_add(win); 36 video = elm_video_add(win);
37 role = efl_access_object_role_get(video); 37 role = efl_access_object_role_get(video);
diff --git a/src/tests/elementary/elm_test_web.c b/src/tests/elementary/elm_test_web.c
index 28607fa..5108cea 100644
--- a/src/tests/elementary/elm_test_web.c
+++ b/src/tests/elementary/elm_test_web.c
@@ -11,7 +11,7 @@ EFL_START_TEST (elm_web_legacy_type_check)
11 Evas_Object *win, *web; 11 Evas_Object *win, *web;
12 const char *type; 12 const char *type;
13 13
14 win = elm_win_add(NULL, "web", ELM_WIN_BASIC); 14 win = win_add(NULL, "web", ELM_WIN_BASIC);
15 15
16 web = elm_web_add(win); 16 web = elm_web_add(win);
17 17
@@ -31,7 +31,7 @@ EFL_START_TEST (elm_atspi_role_get)
31 Evas_Object *win, *web; 31 Evas_Object *win, *web;
32 Efl_Access_Role role; 32 Efl_Access_Role role;
33 33
34 win = elm_win_add(NULL, "web", ELM_WIN_BASIC); 34 win = win_add(NULL, "web", ELM_WIN_BASIC);
35 35
36 web = elm_web_add(win); 36 web = elm_web_add(win);
37 role = efl_access_object_role_get(web); 37 role = efl_access_object_role_get(web);
diff --git a/src/tests/elementary/elm_test_win.c b/src/tests/elementary/elm_test_win.c
index 941495b..1492a76 100644
--- a/src/tests/elementary/elm_test_win.c
+++ b/src/tests/elementary/elm_test_win.c
@@ -68,7 +68,7 @@ EFL_START_TEST (elm_win_legacy_type_check)
68 Evas_Object *win; 68 Evas_Object *win;
69 const char *type; 69 const char *type;
70 70
71 win = elm_win_add(NULL, "win", ELM_WIN_BASIC); 71 win = win_add(NULL, "win", ELM_WIN_BASIC);
72 72
73 type = elm_object_widget_type_get(win); 73 type = elm_object_widget_type_get(win);
74 ck_assert(type != NULL); 74 ck_assert(type != NULL);
@@ -86,7 +86,7 @@ EFL_START_TEST (elm_atspi_role_get)
86 Evas_Object *win; 86 Evas_Object *win;
87 Efl_Access_Role role; 87 Efl_Access_Role role;
88 88
89 win = elm_win_add(NULL, "win", ELM_WIN_BASIC); 89 win = win_add(NULL, "win", ELM_WIN_BASIC);
90 90
91 role = efl_access_object_role_get(win); 91 role = efl_access_object_role_get(win);
92 92
@@ -100,7 +100,7 @@ EFL_START_TEST (elm_atspi_component_screen_position)
100 Eina_Bool ret; 100 Eina_Bool ret;
101 int x, y; 101 int x, y;
102 102
103 Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC); 103 Eo *win = win_add(NULL, "win", ELM_WIN_BASIC);
104 104
105 ret = efl_access_component_screen_position_set(win, 45, 45); 105 ret = efl_access_component_screen_position_set(win, 45, 45);
106 ck_assert(ret == EINA_TRUE); 106 ck_assert(ret == EINA_TRUE);
@@ -116,7 +116,7 @@ EFL_END_TEST
116 116
117EFL_START_TEST (elm_win_autohide) 117EFL_START_TEST (elm_win_autohide)
118{ 118{
119 Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC); 119 Eo *win = win_add(NULL, "win", ELM_WIN_BASIC);
120 if (elm_win_xwindow_get(win)) 120 if (elm_win_xwindow_get(win))
121 { 121 {
122 elm_win_autohide_set(win, EINA_TRUE); 122 elm_win_autohide_set(win, EINA_TRUE);
@@ -139,7 +139,7 @@ EFL_START_TEST (elm_win_policy_quit_last_window_hidden)
139{ 139{
140 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN); 140 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN);
141 141
142 Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC); 142 Eo *win = win_add(NULL, "win", ELM_WIN_BASIC);
143 efl_gfx_entity_visible_set(win, EINA_TRUE); 143 efl_gfx_entity_visible_set(win, EINA_TRUE);
144 144
145 Eina_Bool fail_flag = EINA_FALSE; 145 Eina_Bool fail_flag = EINA_FALSE;
@@ -162,7 +162,7 @@ EFL_START_TEST (elm_win_autohide_and_policy_quit_last_window_hidden)
162{ 162{
163 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN); 163 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_HIDDEN);
164 164
165 Eo *win = elm_win_add(NULL, "win", ELM_WIN_BASIC); 165 Eo *win = win_add(NULL, "win", ELM_WIN_BASIC);
166 if (elm_win_xwindow_get(win)) 166 if (elm_win_xwindow_get(win))
167 { 167 {
168 elm_win_autohide_set(win, EINA_TRUE); 168 elm_win_autohide_set(win, EINA_TRUE);
@@ -363,7 +363,7 @@ EFL_START_TEST (efl_ui_win_multi_touch_inputs)
363 363
364 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); 364 elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
365 365
366 win = elm_win_add(NULL, "win", ELM_WIN_BASIC); 366 win = win_add(NULL, "win", ELM_WIN_BASIC);
367 elm_win_autohide_set(win, EINA_TRUE); 367 elm_win_autohide_set(win, EINA_TRUE);
368 efl_gfx_entity_visible_set(win, EINA_TRUE); 368 efl_gfx_entity_visible_set(win, EINA_TRUE);
369 efl_gfx_entity_size_set(win, EINA_SIZE2D(100, 100)); 369 efl_gfx_entity_size_set(win, EINA_SIZE2D(100, 100));